From 757906d155fa0e5afb28b729e730470123ef5f38 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sat, 20 Jul 2024 03:27:36 +0200
Subject: [PATCH] Call software scripts using individual `fish` commands

---
 scripts/Arch/Software/Firefox/main.fish                 | 3 +--
 scripts/Arch/Software/GRUB/main.fish                    | 3 +--
 scripts/Arch/Software/Virtual Machine Manager/main.fish | 2 +-
 scripts/Arch/Software/aliae/main.fish                   | 3 +--
 scripts/Arch/Software/brave/main.fish                   | 2 +-
 scripts/Arch/Software/git/main.fish                     | 2 +-
 scripts/Arch/Software/logo-ls/main.fish                 | 2 +-
 scripts/Arch/Software/minegrub-theme/main.fish          | 3 +--
 scripts/Arch/Software/nix/main.fish                     | 2 +-
 scripts/Arch/Software/pyenv/main.fish                   | 2 +-
 scripts/Arch/Software/rclone/main.fish                  | 2 +-
 scripts/Arch/Software/vim/main.fish                     | 2 +-
 scripts/Arch/Software/vscode/main.fish                  | 2 +-
 scripts/Arch/Software/zoxide/main.fish                  | 3 +--
 scripts/Common/Software/minegrub-theme/main.fish        | 2 +-
 15 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/scripts/Arch/Software/Firefox/main.fish b/scripts/Arch/Software/Firefox/main.fish
index 5ecd4965..bec3f81b 100644
--- a/scripts/Arch/Software/Firefox/main.fish
+++ b/scripts/Arch/Software/Firefox/main.fish
@@ -2,11 +2,10 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/Firefox/main.fish"
 
     function installSW
         yayinst firefox
-        configureSW
+        fish "$dir/../../../Common/Software/Firefox/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/GRUB/main.fish b/scripts/Arch/Software/GRUB/main.fish
index a3c4cdee..fb9549aa 100644
--- a/scripts/Arch/Software/GRUB/main.fish
+++ b/scripts/Arch/Software/GRUB/main.fish
@@ -2,7 +2,6 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/GRUB/main.fish"
 
     function installSW -V dir
         pacinst \
@@ -10,7 +9,7 @@ begin
             efibootmgr \
             os-prober
 
-        configureSW
+        fish "$dir/../../../Common/Software/GRUB/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/Virtual Machine Manager/main.fish b/scripts/Arch/Software/Virtual Machine Manager/main.fish
index a3f3d6d1..4bcff98e 100644
--- a/scripts/Arch/Software/Virtual Machine Manager/main.fish	
+++ b/scripts/Arch/Software/Virtual Machine Manager/main.fish	
@@ -21,7 +21,7 @@ begin
     function configureSW -V dir
         sudo systemctl enable --now libvirtd
         sudo systemctl enable --now virtlogd
-        source "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
+        fish "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/aliae/main.fish b/scripts/Arch/Software/aliae/main.fish
index d12dfd00..e201e8b6 100644
--- a/scripts/Arch/Software/aliae/main.fish
+++ b/scripts/Arch/Software/aliae/main.fish
@@ -2,13 +2,12 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/aliae/main.fish"
 
     function installSW
         yayinst \
             aliae-bin
 
-        configureSW
+        fish "$dir/../../../Common/Software/aliae/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/brave/main.fish b/scripts/Arch/Software/brave/main.fish
index 72ce3b24..d9ffec33 100644
--- a/scripts/Arch/Software/brave/main.fish
+++ b/scripts/Arch/Software/brave/main.fish
@@ -10,7 +10,7 @@ begin
             # brave-nightly-bin
         )
 
-        configureSW
+        fish "$dir/../../../Common/Software/brave/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/git/main.fish b/scripts/Arch/Software/git/main.fish
index 0b70d6fb..39cfb25c 100644
--- a/scripts/Arch/Software/git/main.fish
+++ b/scripts/Arch/Software/git/main.fish
@@ -13,7 +13,7 @@ begin
             gitflow-fishcompletion-avh \
             gitflow-zshcompletion-avh
 
-        and configureSW
+        and fish "$dir/../../../Common/Software/git/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/logo-ls/main.fish b/scripts/Arch/Software/logo-ls/main.fish
index 76676031..810a9aaf 100644
--- a/scripts/Arch/Software/logo-ls/main.fish
+++ b/scripts/Arch/Software/logo-ls/main.fish
@@ -38,7 +38,7 @@ begin
 
     function configureSW -V dir
         sudo systemctl enable --now nix-daemon
-        source "$dir/../../../Common/Software/logo-ls/main.fish" configure
+        fish "$dir/../../../Common/Software/logo-ls/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/minegrub-theme/main.fish b/scripts/Arch/Software/minegrub-theme/main.fish
index 2e9cbb93..ee583a9b 100644
--- a/scripts/Arch/Software/minegrub-theme/main.fish
+++ b/scripts/Arch/Software/minegrub-theme/main.fish
@@ -2,11 +2,10 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/minegrub-theme/main.fish"
 
     function installSW
         yayinst grub-theme-minegrub-git
-        configureSW
+        fish "$dir/../../../Common/Software/minegrub-theme/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/nix/main.fish b/scripts/Arch/Software/nix/main.fish
index 684f28be..2b91ff25 100644
--- a/scripts/Arch/Software/nix/main.fish
+++ b/scripts/Arch/Software/nix/main.fish
@@ -13,7 +13,7 @@ begin
 
     function configureSW -V dir
         sudo systemctl enable --now nix-daemon
-        source "$dir/../../../Common/Software/nix/main.fish" configure
+        fish "$dir/../../../Common/Software/nix/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/pyenv/main.fish b/scripts/Arch/Software/pyenv/main.fish
index 1769d627..68dbe9d8 100644
--- a/scripts/Arch/Software/pyenv/main.fish
+++ b/scripts/Arch/Software/pyenv/main.fish
@@ -5,7 +5,7 @@ begin
 
     function installSW
         yayinst pyenv
-        source "$dir/../../../Common/Software/pyenv/main.fish" configure
+        fish "$dir/../../../Common/Software/pyenv/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/rclone/main.fish b/scripts/Arch/Software/rclone/main.fish
index 176fdcd7..78715544 100644
--- a/scripts/Arch/Software/rclone/main.fish
+++ b/scripts/Arch/Software/rclone/main.fish
@@ -8,7 +8,7 @@ begin
         yayinst \
             rclone
 
-        configureSW
+        fish "$dir/../../../Common/Software/rclone/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/vim/main.fish b/scripts/Arch/Software/vim/main.fish
index ede0cc82..77686cef 100644
--- a/scripts/Arch/Software/vim/main.fish
+++ b/scripts/Arch/Software/vim/main.fish
@@ -13,7 +13,7 @@ begin
             ) vim-wayland-clipboard-git \
             wl-clipboard
 
-        and configureSW
+        and fish "$dir/../../../Common/Software/vim/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/vscode/main.fish b/scripts/Arch/Software/vscode/main.fish
index f12185e6..c60573c7 100644
--- a/scripts/Arch/Software/vscode/main.fish
+++ b/scripts/Arch/Software/vscode/main.fish
@@ -26,7 +26,7 @@ begin
             end
         end
 
-        source "$dir/../../../Common/Software/vscode/main.fish" configure
+        fish "$dir/../../../Common/Software/vscode/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/zoxide/main.fish b/scripts/Arch/Software/zoxide/main.fish
index eacfe10a..13b2576c 100644
--- a/scripts/Arch/Software/zoxide/main.fish
+++ b/scripts/Arch/Software/zoxide/main.fish
@@ -2,13 +2,12 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/zoxide/main.fish"
 
     function installSW
         yayinst \
             zoxide
 
-        configureSW
+        fish "$dir/../../../Common/Software/zoxide/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Common/Software/minegrub-theme/main.fish b/scripts/Common/Software/minegrub-theme/main.fish
index 3d8a4c2e..4aab4ca1 100644
--- a/scripts/Common/Software/minegrub-theme/main.fish
+++ b/scripts/Common/Software/minegrub-theme/main.fish
@@ -8,7 +8,7 @@ begin
             's/^#\?\(GRUB_THEME=\).*$/\1"\/usr\/share\/grub\/themes\/minegrub\/minegrub\/theme.txt"/' \
             /etc/default/grub
 
-        source "$dir/../GRUB/main.fish" configure
+        fish "$dir/../GRUB/main.fish" configure
     end
 
     runInstaller $argv