Initialize installer properly
This commit is contained in:
parent
2c490e9145
commit
d92dda2649
1 changed files with 3 additions and 3 deletions
|
@ -4,7 +4,9 @@ function runAction -V dir
|
||||||
source "$dir/hooks.fish"
|
source "$dir/hooks.fish"
|
||||||
source "$dir/nix.fish"
|
source "$dir/nix.fish"
|
||||||
source "$dir/settings.fish"
|
source "$dir/settings.fish"
|
||||||
echo "Preparing nix..."
|
echo "Installing dependencies..."
|
||||||
|
and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
|
||||||
|
and echo "Preparing nix..."
|
||||||
and runHook prepareNix || installNixPkgs
|
and runHook prepareNix || installNixPkgs
|
||||||
|
|
||||||
if [ -z "$CONFIG_NAME" ]
|
if [ -z "$CONFIG_NAME" ]
|
||||||
|
@ -13,8 +15,6 @@ function runAction -V dir
|
||||||
end
|
end
|
||||||
|
|
||||||
and runHook prepareAction || true
|
and runHook prepareAction || true
|
||||||
and echo "Installing dependencies..."
|
|
||||||
and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
|
|
||||||
|
|
||||||
echo "Flagging repository as safe..."
|
echo "Flagging repository as safe..."
|
||||||
git config --system --add safe.directory (realpath "$(status dirname)/../..")
|
git config --system --add safe.directory (realpath "$(status dirname)/../..")
|
||||||
|
|
Loading…
Reference in a new issue