various

usr/local/bin/sh.zio.backup

@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 
+if [[ -n $ZIO_HELPERS_DIR ]] && [[ -f $ZIO_HELPERS_DIR ]]; then
+    . "$ZIO_HELPERS_DIR/bash.sh"
+else
   if [[ "$(realpath "$(dirname "$(realpath -s "$0")")/../../../")" == "/" ]]; then
       . /usr/local/libexec/zio/helpers/bash.sh
   else
       . "$(dirname "$(realpath -s "$0")")/../libexec/zio/helpers/bash.sh"
   fi
+fi
 
 me_filename="$(basename "$(realpath -s "$0")")"
 backup_scripts_dir="$(get_config_dir "sh.zio.backup")/scripts"
@@ -65,10 +69,12 @@ function invoke_restic() {
     elif [[ $command == "self-update" ]]; then
         say warning "Command '$command' not supported. Not running"
     else
+        # TODO: Handle deadlocks (--retry-lock could go on forever)
         "$restic_path" \
             --cache-dir "$cache_dir" \
             --password-file "$restic_repo_passwd_file" \
             --repo "$(cat $restic_repo_file)" \
+            --retry-lock 5m \
             $command $args
     fi
 }