correct quotes for shell variables and path

Author: NeejaYanglea

electronClient.js

@@ -50,10 +50,18 @@ ipcMain.on('script:copy', function(e, script){
     }
     console.log("The script file was saved to " + path.join(tmp_folder, "script.sh"));
     console.log("Running " + path.join(tmp_folder, "script.sh"));
-    exec((isWin ? '':'bash ') + path.join(tmp_folder, "script.sh"), function (err, stdout, stderr) {
+    if(isWin) {
+      exec('' + path.join(tmp_folder, "script.sh"), function (err, stdout, stderr){
         //console.log(err, stdout, stderr);
         return;
-    });
+      });
+    }
+    else {
+      exec('bash \"' + path.join(tmp_folder, "script.sh\""), function (err, stdout, stderr) {
+        //console.log(err, stdout, stderr);
+        return;
+      });
+    }
   }); 
 
 });
@@ -66,7 +74,7 @@ ipcMain.on('script:execute', function(e){
     });
   }
   else {
-    exec('bash -c "$NETKIT_HOME/lstart -d ' + path.join(tmp_folder, "lab") + '"', function (err, stdout, stderr) {
+    exec('bash -c \'$NETKIT_HOME/lstart -d "\\\"' + path.join(tmp_folder, "lab") + '\\\""\'', function (err, stdout, stderr) {
         //console.log(err, stdout, stderr);
         return;
     });
@@ -82,7 +90,7 @@ ipcMain.on('script:clean', function(e){
     });
   }
   else {
-    exec('bash -c "$NETKIT_HOME/lclean -d ' + path.join(tmp_folder, "lab") + '"', function (err, stdout, stderr) {
+    exec('bash -c \'$NETKIT_HOME/lclean -d "\\\"' + path.join(tmp_folder, "lab") + '\\\""\'', function (err, stdout, stderr) {
         //console.log(err, stdout, stderr);
         return;
     });

js/make.js

@@ -474,7 +474,7 @@ function makeScript(lab){
             text += "echo '" + lines[lineIndex] + "' >> " + fileName + "\n";
         }
     }
-    text += "rm $0\n";
+    text += "rm \"$0\"\n";
 
     return text;
 }