Commit: f6efce9f137a94a76cbf271aefcf530584e4e10d Author: krakjoe <joe.watk...@live.co.uk> Sun, 1 Dec 2013 13:17:54 +0000 Parents: 01ed1f436c4d306c316fc43e3f6b67d28b948027 Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f6efce9f137a94a76cbf271aefcf530584e4e10d Log: ws Changed paths: M phpdbg.init.d M tutorials/java/dist/phpdbg-ui.jar Diff: diff --git a/phpdbg.init.d b/phpdbg.init.d index 1175044..cc18957 100755 --- a/phpdbg.init.d +++ b/phpdbg.init.d @@ -50,73 +50,73 @@ insanity() start() { - insanity + insanity - if [ $? -eq 1 ]; then - return $RETVAL - fi + if [ $? -eq 1 ]; then + return $RETVAL + fi - echo -n $"Starting: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} " - nohup ${PHPDBG} -l${STDIN}/${STDOUT} ${OPTIONS} 2>>${LOGFILE} 1>/dev/null </dev/null & - PID=$! - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo $PID > $PIDFILE - echo_success - else - echo_failure - fi - echo - [ $RETVAL = 0 ] && touch ${LOCKFILE} - return $RETVAL + echo -n $"Starting: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} " + nohup ${PHPDBG} -l${STDIN}/${STDOUT} ${OPTIONS} 2>>${LOGFILE} 1>/dev/null </dev/null & + PID=$! + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + echo $PID > $PIDFILE + echo_success + else + echo_failure + fi + echo + [ $RETVAL = 0 ] && touch ${LOCKFILE} + return $RETVAL } stop() { - insanity + insanity - if [ $? -eq 1 ]; then - return $RETVAL + if [ $? -eq 1 ]; then + return $RETVAL + fi + + if [ -f ${LOCKFILE} ] && [ -f ${PIDFILE} ] + then + echo -n $"Stopping: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} " + kill -s TERM $(cat $PIDFILE) + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + echo_success + else + echo_failure fi - - if [ -f ${LOCKFILE} ] && [ -f ${PIDFILE} ] - then - echo -n $"Stopping: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} " - kill -s TERM $(cat $PIDFILE) - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success - else - echo_failure - fi - echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} - else - echo -n $"Error: phpdbg not running" - echo_failure - echo - [ $RETVAL = 1 ] - fi - return $RETVAL + echo + [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} + else + echo -n $"Error: phpdbg not running" + echo_failure + echo + [ $RETVAL = 1 ] + fi + return $RETVAL } ################################################################## case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $PHPDBG - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 start|stop|restart|status" - ;; + start) + start + ;; + stop) + stop + ;; + status) + status $PHPDBG + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 start|stop|restart|status" + ;; esac ################################################################### exit $RETVAL diff --git a/tutorials/java/dist/phpdbg-ui.jar b/tutorials/java/dist/phpdbg-ui.jar index 7850d33..bf98166 100644 Binary files a/tutorials/java/dist/phpdbg-ui.jar and b/tutorials/java/dist/phpdbg-ui.jar differ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
