[skip ci] SysVInit changes for ubuntu 14.04

Author: cpriego

cli/Valet/DnsMasq.php

@@ -86,7 +86,6 @@ private function _mergeDns()
         $this->files->backup($this->resolvconf);
         $this->files->unlink($this->resolvconf);
         $this->files->symlink($script, $this->resolvconf);
-        $this->sm->start('valet-dns');
 
         return true;
     }
@@ -105,6 +104,7 @@ public function install($domain = 'test')
         $this->createCustomConfigFile($domain);
         $this->pm->nmRestart($this->sm);
         $this->sm->restart('dnsmasq');
+        $this->sm->start('valet-dns');
     }
 
     /**

cli/stubs/init/sysvinit

@@ -14,6 +14,7 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 PIDFILE=/opt/valet-linux/watch.pid
+LOGFILE=/opt/valet-linux/watch.log
 DAEMON=/opt/valet-linux/valet-dns
 NAME=valet-dns
 DESC="Valet DNS Resolution"
@@ -26,13 +27,16 @@ test -x $DAEMON || exit 0
 . /lib/lsb/init-functions
 
 start() {
-    test -f $PIDFILE && rm $PIDFILE
+    test -f "$PIDFILE" && rm "$PIDFILE"
     start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON start || return 2
 }
 
 stop() {
-    start-stop-daemon --stop --retry=$STOP_SCHEDULE --pidfile $PIDFILE || return 1
-    test -f $PIDFILE && rm $PIDFILE
+    if [ -f "$PIDFILE" ]; then
+        start-stop-daemon --stop --retry=$STOP_SCHEDULE --pidfile $PIDFILE && rm "$PIDFILE" || return 1
+    fi
+
+    test -f "$LOGFILE" && rm "$LOGFILE"
 }
 
 case "$1" in

cli/stubs/valet-dns

@@ -92,7 +92,7 @@ function watchDirs() {
     local WATCHERS=(${DIRS[@]} "$DNSHEAD")
 
     # Log which directories are being watched
-    echo "Watching the following directories:" >> "$LOGFILE" 
+    echo "Watching the following directories for changes:" >> "$LOGFILE" 
 
     for DIR in "${DIRS[@]}"; do
         echo " - $DIR" >> "$LOGFILE" 
@@ -163,7 +163,12 @@ function restart {
 }
 
 function status {
-    cat '/opt/valet-linux/watch.log'
+    if [[ -f "$LOGFILE" ]]; then
+        echo -e "Valet DNS service is running correctly.\n"
+        cat '/opt/valet-linux/watch.log'
+    else
+        echo "Valet DNS service is not running."
+    fi
 }
 
 case "$1" in