Updated files from the dev branch.

1 files changed, 16 insertions, 3 deletions

diff --git a/run.sh b/run.sh
index b4e56810b964..f78b479a03e8 100755
--- a/run.sh
+++ b/run.sh
@@ -22,8 +22,8 @@
 #
 #
 
-pkg_dir="/opt/rserve-sandbox-docker"
-pid_file="/run/rserve-sandbox-docker.pid"
+pkg_dir="/usr/share/rserve-sandbox-docker"
+pid_file="/run/rserve-sandbox-docker/rserve-sandbox-docker.pid"
 user="rsd"
 group="rsd"
 docker_image_name="rserve"
@@ -75,6 +75,19 @@ initialize()
     fi
 }
 
+killd()
+{
+    # kill action only if process exists.
+    if [ -f "$pid_file" ]; then
+        pid=$(cat "$pid_file")
+        ps -q $pid > /dev/null
+        if [ $? -eq 0 ]; then
+                make -C "$pkg_dir" stop
+        fi
+    fi
+}
+
+
 startd()
 {
     local pid=""
@@ -145,7 +158,7 @@ killd()
         pid=$(cat "$pid_file")
         ps -q $pid > /dev/null
         if [ $? -eq 0 ]; then
-            kill -s SIGTERM $pid
+            kill -s TERM $pid
         fi
     fi
 }