Fix(treewide): Update to new shell library version

10 files changed, 23 insertions, 31 deletions

diff --git a/home-manager/packages/scripts.nix b/home-manager/packages/scripts.nix
index ca377e18..73b52d37 100644
--- a/home-manager/packages/scripts.nix
+++ b/home-manager/packages/scripts.nix
@@ -8,9 +8,9 @@
     path,
     dependencies,
   }:
-    sysLib.makeShellScriptWithLibrary {
+    sysLib.writeShellScriptWithLibrary {
       inherit name;
-      script = ./scripts/${path}/${name};
+      src = ./scripts/${path}/${name};
       dependencies = dependencies ++ [pkgs.dash];
     };
   aumo-scr = write_script {
@@ -55,9 +55,9 @@
     path = "wrappers";
     dependencies = builtins.attrValues {}; # TODO add snap-sync
   };
-  ll-scr = sysLib.makeShellScriptWithLibraryUnwrapped {
+  ll-scr = sysLib.writeShellScriptWithLibraryUnwrapped {
     name = "ll";
-    script = ./scripts/wrappers/ll;
+    src = ./scripts/wrappers/ll;
   };
   # TODO this need to be replaced with a wayland alternative
   #  llp-scr = write_script {
diff --git a/home-manager/packages/scripts/apps/aumo b/home-manager/packages/scripts/apps/aumo
index df12c111..2a1054ad 100755
--- a/home-manager/packages/scripts/apps/aumo
+++ b/home-manager/packages/scripts/apps/aumo
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2046,2086
 
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 if [ "$1" = "-u" ];then udisksctl unmount -b $(cat $HOME/.cache/aumo/mnt_disk); exit 0; fi
 all_available_disks=$(mktemp)
diff --git a/home-manager/packages/scripts/apps/con2pdf b/home-manager/packages/scripts/apps/con2pdf
index a3e45e29..653af5cb 100755
--- a/home-manager/packages/scripts/apps/con2pdf
+++ b/home-manager/packages/scripts/apps/con2pdf
@@ -1,6 +1,7 @@
 #! /usr/bin/env dash
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 # needed for help() and version
diff --git a/home-manager/packages/scripts/small_functions/gtk-themes b/home-manager/packages/scripts/small_functions/gtk-themes
index 5c1049ed..3d81aee8 100755
--- a/home-manager/packages/scripts/small_functions/gtk-themes
+++ b/home-manager/packages/scripts/small_functions/gtk-themes
@@ -1,7 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 
@@ -18,7 +18,3 @@ gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
 gsettings set "$gnome_schema" icon-theme "$icon_theme"
 gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
-
-
-
-if [ -d /tmp/LIB_FILE_TEMP_DIR/ ];then rm -r /tmp/LIB_FILE_TEMP_DIR/; fi
diff --git a/home-manager/packages/scripts/small_functions/screen_shot b/home-manager/packages/scripts/small_functions/screen_shot
index 92c37fdd..d0cbeb5c 100755
--- a/home-manager/packages/scripts/small_functions/screen_shot
+++ b/home-manager/packages/scripts/small_functions/screen_shot
@@ -1,9 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 grim -g "$(slurp)" ~/media/pictures/screenshots/"$(date +%s)".png &&
     alacritty -e llp -command ":{{ set sortby atime; set reverse!; }}" ~/media/pictures/screenshots
-
-
diff --git a/home-manager/packages/scripts/small_functions/update-sys b/home-manager/packages/scripts/small_functions/update-sys
index 69f822b3..c1df4f48 100755
--- a/home-manager/packages/scripts/small_functions/update-sys
+++ b/home-manager/packages/scripts/small_functions/update-sys
@@ -1,7 +1,7 @@
 #!/usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 help() {
     cat << EOF
diff --git a/home-manager/packages/scripts/wrappers/ll b/home-manager/packages/scripts/wrappers/ll
index 16dd4c72..48bd0ad3 100755
--- a/home-manager/packages/scripts/wrappers/ll
+++ b/home-manager/packages/scripts/wrappers/ll
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 export LLP=0
 tmp="$(mktmp)"
diff --git a/home-manager/packages/scripts/wrappers/spodi b/home-manager/packages/scripts/wrappers/spodi
index 6f92140d..41d2b443 100755
--- a/home-manager/packages/scripts/wrappers/spodi
+++ b/home-manager/packages/scripts/wrappers/spodi
@@ -1,7 +1,7 @@
-#! /usr/bin/env dash
+#!/usr/bin/env dash
 
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 DOWN_DIR=/home/soispha/media/music/down/
diff --git a/home-manager/packages/scripts/wrappers/virsh-del b/home-manager/packages/scripts/wrappers/virsh-del
index 584c53c5..3bdd0af5 100755
--- a/home-manager/packages/scripts/wrappers/virsh-del
+++ b/home-manager/packages/scripts/wrappers/virsh-del
@@ -1,10 +1,10 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 virsh destroy "$1"
 virsh undefine "$1" --nvram
 virsh vol-delete --pool default "$1".qcow2
 
-
+# vim: ft=sh
diff --git a/home-manager/packages/scripts/wrappers/yti b/home-manager/packages/scripts/wrappers/yti
index 47e8cf3a..d335a337 100755
--- a/home-manager/packages/scripts/wrappers/yti
+++ b/home-manager/packages/scripts/wrappers/yti
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
 
+# shellcheck source=/dev/null
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 DOWN_DIR=/home/dt/media/playlist/down/
 
@@ -33,4 +32,4 @@ cd $DOWN_DIR || die "BUG: no $DOWN_DIR"
 
 unbuffer yt-dlp  --config-location "$config" "$1" | tee $DOWN_DIR/yt-dlp.log
 
-if [ -d /tmp/LIB_FILE_TEMP_DIR/ ];then rm -r /tmp/LIB_FILE_TEMP_DIR/; fi
+# vim: ft=sh