From 09e405bd9d93e539ce653d8116467fa06881580f Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Mon, 15 Jul 2024 12:43:18 +0200
Subject: [PATCH] Allow package install scripts to be chained properly

---
 scripts/Arch/Software/base-devel/main.fish | 2 +-
 scripts/Arch/Software/git/main.fish        | 2 +-
 scripts/Arch/Software/openssh/main.fish    | 2 +-
 scripts/Arch/Software/vim/main.fish        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/Arch/Software/base-devel/main.fish b/scripts/Arch/Software/base-devel/main.fish
index 7322c5a6..df90859e 100644
--- a/scripts/Arch/Software/base-devel/main.fish
+++ b/scripts/Arch/Software/base-devel/main.fish
@@ -5,7 +5,7 @@ begin
 
     function installSW
         pacinst base-devel
-        configureSW
+        and configureSW
     end
 
     function configureSW
diff --git a/scripts/Arch/Software/git/main.fish b/scripts/Arch/Software/git/main.fish
index aab077bf..26279555 100644
--- a/scripts/Arch/Software/git/main.fish
+++ b/scripts/Arch/Software/git/main.fish
@@ -12,7 +12,7 @@ begin
             gitflow-fishcompletion-avh \
             gitflow-zshcompletion-avh
 
-        fish "$dir/../../../Common/Software/git/main.fish" configure
+        and fish "$dir/../../../Common/Software/git/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/openssh/main.fish b/scripts/Arch/Software/openssh/main.fish
index 6b78f0d0..271a31dc 100644
--- a/scripts/Arch/Software/openssh/main.fish
+++ b/scripts/Arch/Software/openssh/main.fish
@@ -12,7 +12,7 @@ begin
     function configureSW
         systemctl --global enable --now ssh-agent
 
-        begin
+        and begin
             printf %s\n \
                 "#!/bin/bash" \
                 'export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"'
diff --git a/scripts/Arch/Software/vim/main.fish b/scripts/Arch/Software/vim/main.fish
index b9c6e542..ede0cc82 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
 
-        configureSW
+        and configureSW
     end
 
     runInstaller $argv