From c531d6cff98edf158dcdf2ce8d92c6e0d5940a79 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 12 Sep 2024 18:52:03 +0200 Subject: [PATCH] Ensure fish scripts exit early --- scripts/Arch/OS/setup.fish | 2 +- scripts/Common/OS/setup.fish | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 0f177137..950ebf02 100755 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -107,7 +107,7 @@ begin set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf" arch-chroot "$mountDir" mkdir -p (dirname "$file") - begin + and begin printf %s\n \ "[Service]" \ "ExecStart=" \ diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index 7ae4acf2..3e0f875e 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -32,9 +32,9 @@ function runSetup function runInOS -S set -l script "/root/run_once" wrapScript $argv | chroot "$mountDir" tee "$script" > /dev/null - runChroot "$mountDir" chmod +x "$script" - runChroot "$mountDir" "$script" - runChroot "$mountDir" rm "$script" + and runChroot "$mountDir" chmod +x "$script" + and runChroot "$mountDir" "$script" + and runChroot "$mountDir" rm "$script" end function wrapScript -S