From 2e6d60c5d4afbeef6c4b2d0ad7ef906ba25e39c6 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 30 Jul 2024 00:52:35 +0200
Subject: [PATCH] Fix non-functioning installation scripts

---
 scripts/Arch/Software/n/main.fish                     | 2 +-
 scripts/Arch/Software/openssh/main.fish               | 4 +++-
 scripts/Common/Software/Chromium/install-extension.sh | 2 +-
 scripts/Common/Software/pyenv/main.fish               | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/Arch/Software/n/main.fish b/scripts/Arch/Software/n/main.fish
index c1717c1e2..5a3fb6961 100755
--- a/scripts/Arch/Software/n/main.fish
+++ b/scripts/Arch/Software/n/main.fish
@@ -5,7 +5,7 @@ begin
 
     function installSW -V dir
         yayinst nodejs-n
-        sudo fish "$dir/../../../Common/Software/n/main.fish" configure
+        sudo --preserve-env --set-home fish "$dir/../../../Common/Software/n/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/openssh/main.fish b/scripts/Arch/Software/openssh/main.fish
index 271a31dcb..d95bfc0bf 100755
--- a/scripts/Arch/Software/openssh/main.fish
+++ b/scripts/Arch/Software/openssh/main.fish
@@ -7,10 +7,12 @@ begin
         yayinst \
             openssh \
             libfido2
+
+        source (status filename) configure
     end
 
     function configureSW
-        systemctl --global enable --now ssh-agent
+        sudo systemctl --global enable ssh-agent
 
         and begin
             printf %s\n \
diff --git a/scripts/Common/Software/Chromium/install-extension.sh b/scripts/Common/Software/Chromium/install-extension.sh
index 253a97aa0..8e025d13d 100644
--- a/scripts/Common/Software/Chromium/install-extension.sh
+++ b/scripts/Common/Software/Chromium/install-extension.sh
@@ -14,7 +14,7 @@ then
         UNPACKED_EXTENSION="${UNPACKED_EXTENSION}" \
         EXTENSION_DIR="${EXTENSION_DIR}" \
         EXTENSION_POLICY_DIR="${EXTENSION_POLICY_DIR}" \
-        bash "$BASH_SOURCE" "$USER";
+        bash --login "$BASH_SOURCE" "$USER";
 else
     keyFile="$UNPACKED_EXTENSION.pem";
     extensionFile="$UNPACKED_EXTENSION.crx";
diff --git a/scripts/Common/Software/pyenv/main.fish b/scripts/Common/Software/pyenv/main.fish
index 233e88ed9..967f39c90 100755
--- a/scripts/Common/Software/pyenv/main.fish
+++ b/scripts/Common/Software/pyenv/main.fish
@@ -20,7 +20,7 @@ begin
         end | installBashProfile "pyenv" > /dev/null
 
         if type -q fish
-            addFishProfile "pyenv" "pyenv" "pyenv init - | source"
+            installFishProfile "pyenv" "pyenv" "pyenv init - | source"
         end
     end