Fix(treewide): Update to new shell library version

5 files changed, 10 insertions, 18 deletions

diff --git a/home-manager/config/yambar/default.nix b/home-manager/config/yambar/default.nix
index f11a3300..76d3109d 100644
--- a/home-manager/config/yambar/default.nix
+++ b/home-manager/config/yambar/default.nix
@@ -13,9 +13,9 @@
     dependencies,
     ...
   }:
-    sysLib.makeShellScriptWithLibrary {
+    sysLib.writeShellScriptWithLibrary {
       name = "${builtins.baseNameOf file}";
-      script = file;
+      src = file;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;});
     }
     + "/bin/${builtins.baseNameOf file}";
diff --git a/home-manager/config/yambar/scripts/disk b/home-manager/config/yambar/scripts/disk
index dad41feb..d96a8683 100755
--- a/home-manager/config/yambar/scripts/disk
+++ b/home-manager/config/yambar/scripts/disk
@@ -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
 
 # Main loop
 while true; do
@@ -20,5 +19,4 @@ while true; do
   sleep 1
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/grades-average b/home-manager/config/yambar/scripts/grades-average
index 98e06858..b8b5c04c 100755
--- a/home-manager/config/yambar/scripts/grades-average
+++ b/home-manager/config/yambar/scripts/grades-average
@@ -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
 
 while true; do
     grade=$(grades list average | awk '{print $2}');
@@ -13,5 +12,4 @@ while true; do
     sleep 1;
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/network b/home-manager/config/yambar/scripts/network
index 45c164df..0d98b110 100755
--- a/home-manager/config/yambar/scripts/network
+++ b/home-manager/config/yambar/scripts/network
@@ -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
 
 retest=120
 retest_if_con_fails=10
@@ -45,5 +44,4 @@ case "$backend" in
         ;;
 esac
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/sound-volume b/home-manager/config/yambar/scripts/sound-volume
index 8a9cf0d2..41230141 100755
--- a/home-manager/config/yambar/scripts/sound-volume
+++ b/home-manager/config/yambar/scripts/sound-volume
@@ -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
 
 while true; do
     volume=$(pactl get-sink-volume 0 | awk 'BEGIN { FS="/" } {gsub("%","",$2); gsub(" ","",$2)} {printf $2}')
@@ -18,5 +17,4 @@ while true; do
     sleep 1;
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh