diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish index 314c518d..fa2e94d4 100644 --- a/scripts/Arch/OS/install.fish +++ b/scripts/Arch/OS/install.fish @@ -1,3 +1,16 @@ #!/bin/env fish set -l dir (status dirname) + +function initialize -V dir + "$dir/../Software/base-devel/install.sh" + "$dir/../Config/pacman/install.sh" + "$dir/../Software/yay/install.sh" +end + +if not type -q installSoftware + function installSoftware + . "$(pwd)/../Collections/personal.sh"; + end +end + source "$dir/../../Common/OS/install.fish" diff --git a/scripts/Common/OS/install.fish b/scripts/Common/OS/install.fish index dc9d063b..2a841efa 100644 --- a/scripts/Common/OS/install.fish +++ b/scripts/Common/OS/install.fish @@ -31,6 +31,12 @@ if [ (id -u) -eq 0 ] and sudo --preserve-env="CONFIG_MODULE" --user "$name" "$INSTALLER_SCRIPT" rm "$sudoConfig" + userdel -r "$name" else - + runHook initialize || true + runHook installDrivers || true + runHook installOS || true + runHook installSoftware || true + runHook initializeConfig || true + runHook postInstall || true end