Use source
instead of dot notation
This commit is contained in:
parent
d4fa8f2ebd
commit
2ca85d797b
|
@ -6,7 +6,7 @@ begin
|
||||||
set -l projectDir "$dir/.."
|
set -l projectDir "$dir/.."
|
||||||
|
|
||||||
begin
|
begin
|
||||||
. "$dir/template-path.fish"
|
source "$dir/template-path.fish"
|
||||||
rm -rf "$contextRoot"
|
rm -rf "$contextRoot"
|
||||||
and cp -r "$(templatePath)" "$contextRoot"
|
and cp -r "$(templatePath)" "$contextRoot"
|
||||||
and chmod -R 755 "$contextRoot"
|
and chmod -R 755 "$contextRoot"
|
||||||
|
|
|
@ -3,7 +3,7 @@ begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
set -l projectDir "$dir/.."
|
set -l projectDir "$dir/.."
|
||||||
set -l patch "$dir/valhalla.patch"
|
set -l patch "$dir/valhalla.patch"
|
||||||
. "$dir/template-path.fish"
|
source "$dir/template-path.fish"
|
||||||
cp -r "$(templatePath)"/* "$projectDir"
|
cp -r "$(templatePath)"/* "$projectDir"
|
||||||
|
|
||||||
and begin
|
and begin
|
||||||
|
|
|
@ -6,4 +6,4 @@ end
|
||||||
CONFIG_MODULE="$(status dirname)/config.nix" \
|
CONFIG_MODULE="$(status dirname)/config.nix" \
|
||||||
ARCH_HOSTNAME="manu-surface" \
|
ARCH_HOSTNAME="manu-surface" \
|
||||||
USER_DISPLAYNAME="Manuel Thalmann" \
|
USER_DISPLAYNAME="Manuel Thalmann" \
|
||||||
. "$(status dirname)/../../../scripts/Arch/OS/setup.fish";
|
source "$(status dirname)/../../../scripts/Arch/OS/setup.fish";
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
. "$dir/../../Common/Scripts/config.fish"
|
source "$dir/../../Common/Scripts/config.fish"
|
||||||
. "$dir/../../Common/Scripts/hooks.fish"
|
source "$dir/../../Common/Scripts/hooks.fish"
|
||||||
|
|
||||||
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
||||||
set -q ARCH_TIMEZONE || set -l ARCH_TIMEZONE "Europe/Zurich"
|
set -q ARCH_TIMEZONE || set -l ARCH_TIMEZONE "Europe/Zurich"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
function getConfig -S -a property
|
function getConfig -S -a property
|
||||||
. "$(status dirname)/eval-module.fish"
|
source "$(status dirname)/eval-module.fish"
|
||||||
evalModule "$CONFIG_MODULE" "$property" $argv[2..]
|
evalModule "$CONFIG_MODULE" "$property" $argv[2..]
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue