--- a/gogoc-tsp/template/linux.sh
+++ b/gogoc-tsp/template/linux.sh
@@ -12,30 +12,29 @@
 
 LANGUAGE=C
 
-if [ -z $TSP_VERBOSE ]; then
+if [ -z "$TSP_VERBOSE" ]; then
    TSP_VERBOSE=0
 fi
 
 KillProcess()
 {
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
+   if [ ! -z "$TSP_VERBOSE" ]; then
+      if [ "$TSP_VERBOSE" -ge 2 ]; then
          echo killing $*
       fi
    fi
    PID=`ps axww | grep $1 | grep -v grep | awk '{ print $1;}'`
-   echo $PID
-   if [ ! -z $PID ]; then
-      kill $PID
+   if [ ! -z "$PID" ]; then
+      kill "$PID"
    fi
 }
 
 Display()
 {
-   if [ -z $TSP_VERBOSE ]; then
+   if [ -z "$TSP_VERBOSE" ]; then
       return;
    fi
-   if [ $TSP_VERBOSE -lt $1 ]; then
+   if [ "$TSP_VERBOSE" -lt "$1" ]; then
       return;
    fi
    shift
@@ -44,8 +43,8 @@
 
 Exec()
 {
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
+   if [ ! -z "$TSP_VERBOSE" ]; then
+      if [ "$TSP_VERBOSE" -ge 2 ]; then
          echo $*
       fi
    fi
@@ -59,8 +58,8 @@
 
 ExecNoCheck()
 {
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
+   if [ ! -z "$TSP_VERBOSE" ]; then
+      if [ "$TSP_VERBOSE" -ge 2 ]; then
          echo $*
       fi
    fi
@@ -107,18 +106,18 @@
 rtadvdconfigfile=$TSP_HOME_DIR/$rtadvdconfigfilename
 resolv_conf=/etc/resolv.conf
 
-if [ -z $TSP_HOME_DIR ]; then
+if [ -z "$TSP_HOME_DIR" ]; then
    echo "TSP_HOME_DIR variable not specified!;"
    exit 1
 fi
 
-if [ ! -d $TSP_HOME_DIR ]; then
+if [ ! -d "$TSP_HOME_DIR" ]; then
    echo "Error : directory $TSP_HOME_DIR does not exist"
    exit 1
 fi
 #
 
-if [ -z $TSP_HOST_TYPE ]; then
+if [ -z "$TSP_HOST_TYPE" ]; then
    echo Error: TSP_HOST_TYPE not defined.
    exit 1
 fi
