From 2ca85d797b3a8057fa5d298c95730f8b66238e6b Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Tue, 9 Jul 2024 04:00:26 +0200 Subject: [PATCH] Use `source` instead of dot notation --- archiso/scripts/show-diff.fish | 2 +- archiso/scripts/update.fish | 2 +- profiles/ManuSurface/Arch/setup.fish | 2 +- scripts/Arch/OS/setup.fish | 4 ++-- scripts/Common/Scripts/config.fish | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archiso/scripts/show-diff.fish b/archiso/scripts/show-diff.fish index 2ec5c8f4..36beafc8 100755 --- a/archiso/scripts/show-diff.fish +++ b/archiso/scripts/show-diff.fish @@ -6,7 +6,7 @@ begin set -l projectDir "$dir/.." begin - . "$dir/template-path.fish" + source "$dir/template-path.fish" rm -rf "$contextRoot" and cp -r "$(templatePath)" "$contextRoot" and chmod -R 755 "$contextRoot" diff --git a/archiso/scripts/update.fish b/archiso/scripts/update.fish index 31d8188b..603ffac0 100755 --- a/archiso/scripts/update.fish +++ b/archiso/scripts/update.fish @@ -3,7 +3,7 @@ begin set -l dir (status dirname) set -l projectDir "$dir/.." set -l patch "$dir/valhalla.patch" - . "$dir/template-path.fish" + source "$dir/template-path.fish" cp -r "$(templatePath)"/* "$projectDir" and begin diff --git a/profiles/ManuSurface/Arch/setup.fish b/profiles/ManuSurface/Arch/setup.fish index 3105abc4..26e5cf96 100755 --- a/profiles/ManuSurface/Arch/setup.fish +++ b/profiles/ManuSurface/Arch/setup.fish @@ -6,4 +6,4 @@ end CONFIG_MODULE="$(status dirname)/config.nix" \ ARCH_HOSTNAME="manu-surface" \ USER_DISPLAYNAME="Manuel Thalmann" \ - . "$(status dirname)/../../../scripts/Arch/OS/setup.fish"; + source "$(status dirname)/../../../scripts/Arch/OS/setup.fish"; diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 1bb1be24..d60f7aca 100644 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -1,8 +1,8 @@ #!/bin/env fish begin set -l dir (status dirname) - . "$dir/../../Common/Scripts/config.fish" - . "$dir/../../Common/Scripts/hooks.fish" + source "$dir/../../Common/Scripts/config.fish" + source "$dir/../../Common/Scripts/hooks.fish" set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix" set -q ARCH_TIMEZONE || set -l ARCH_TIMEZONE "Europe/Zurich" diff --git a/scripts/Common/Scripts/config.fish b/scripts/Common/Scripts/config.fish index fd23b0d9..a0d37f3f 100644 --- a/scripts/Common/Scripts/config.fish +++ b/scripts/Common/Scripts/config.fish @@ -1,5 +1,5 @@ #!/bin/env fish function getConfig -S -a property - . "$(status dirname)/eval-module.fish" + source "$(status dirname)/eval-module.fish" evalModule "$CONFIG_MODULE" "$property" $argv[2..] end