Merge d190a60ff7 into d800d356ca

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

resources/gcode_shell_command.py

@@ -18,6 +18,7 @@ class ShellCommand:
         self.command = shlex.split(cmd)
         self.timeout = config.getfloat('timeout', 2., above=0.)
         self.verbose = config.getboolean('verbose', True)
+        self.terminate = config.getboolean('terminate', True)
         self.proc_fd = None
         self.partial_output = ""
         self.gcode.register_mux_command(
@@ -68,7 +69,7 @@ class ShellCommand:
             if proc.poll() is not None:
                 complete = True
                 break
-        if not complete:
+        if not complete and self.terminate:
             proc.terminate()
         if self.verbose:
             if self.partial_output:

scripts/backup.sh

@@ -43,15 +43,17 @@ function backup_config_dir() {
 
     local i=0 folder folder_name target_dir
     for folder in ${config_pathes}; do
-      status_msg "Create backup of ${folder} ..."
+      if [[ -d ${folder} ]]; then
-
+        status_msg "Create backup of ${folder} ..."
-      folder_name=$(echo "${folder}" | rev | cut -d"/" -f2 | rev)
+  
-      target_dir="${BACKUP_DIR}/configs/${current_date}/${folder_name}"
+        folder_name=$(echo "${folder}" | rev | cut -d"/" -f2 | rev)
-      mkdir -p "${target_dir}"
+        target_dir="${BACKUP_DIR}/configs/${current_date}/${folder_name}"
-      cp -r "${folder}" "${target_dir}"
+        mkdir -p "${target_dir}"
-      i=$(( i + 1 ))
+        cp -r "${folder}" "${target_dir}"
-
+        i=$(( i + 1 ))
-      ok_msg "Backup created in:\n${target_dir}"
+  
+        ok_msg "Backup created in:\n${target_dir}"
+      fi
     done
   else
     ok_msg "No config directory found! Skipping backup ..."