diff --git a/HISTORY b/HISTORY index c7a2594..f837e5b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,7 @@ -Version 5.06 2014-11-30 +Version 5.06 2014-12-04 * compile passed in mac OS Darwin + * correct scripts in subdir init.d Version 5.05 2014-11-22 * tracker_mem.c log more info diff --git a/init.d/fdfs_storaged b/init.d/fdfs_storaged index 46e55ee..3639fc9 100755 --- a/init.d/fdfs_storaged +++ b/init.d/fdfs_storaged @@ -12,7 +12,7 @@ # Source function library. . /etc/init.d/functions -PRG=/usr/local/bin/fdfs_storaged +PRG=/usr/bin/fdfs_storaged CONF=/etc/fdfs/storage.conf if [ ! -f $PRG ]; then @@ -20,16 +20,6 @@ if [ ! -f $PRG ]; then exit 2 fi -if [ ! -f /usr/local/bin/stop.sh ]; then - echo "file /usr/local/bin/stop.sh does not exist!" - exit 2 -fi - -if [ ! -f /usr/local/bin/restart.sh ]; then - echo "file /usr/local/bin/restart.sh does not exist!" - exit 2 -fi - if [ ! -f $CONF ]; then echo "file $CONF does not exist!" exit 2 @@ -46,7 +36,7 @@ start() { return $RETVAL } stop() { - /usr/local/bin/stop.sh $CMD + $CMD stop RETVAL=$? return $RETVAL } @@ -54,7 +44,7 @@ rhstatus() { status fdfs_storaged } restart() { - /usr/local/bin/restart.sh $CMD & + $CMD restart & } case "$1" in diff --git a/init.d/fdfs_trackerd b/init.d/fdfs_trackerd index f9cd21d..a5df64b 100755 --- a/init.d/fdfs_trackerd +++ b/init.d/fdfs_trackerd @@ -12,7 +12,7 @@ # Source function library. . /etc/init.d/functions -PRG=/usr/local/bin/fdfs_trackerd +PRG=/usr/bin/fdfs_trackerd CONF=/etc/fdfs/tracker.conf if [ ! -f $PRG ]; then @@ -20,16 +20,6 @@ if [ ! -f $PRG ]; then exit 2 fi -if [ ! -f /usr/local/bin/stop.sh ]; then - echo "file /usr/local/bin/stop.sh does not exist!" - exit 2 -fi - -if [ ! -f /usr/local/bin/restart.sh ]; then - echo "file /usr/local/bin/restart.sh does not exist!" - exit 2 -fi - if [ ! -f $CONF ]; then echo "file $CONF does not exist!" exit 2 @@ -46,7 +36,7 @@ start() { return $RETVAL } stop() { - /usr/local/bin/stop.sh $CMD + $CMD stop RETVAL=$? return $RETVAL } @@ -54,7 +44,7 @@ rhstatus() { status fdfs_trackerd } restart() { - /usr/local/bin/restart.sh $CMD & + $CMD restart & } case "$1" in