Restructure bootstrap dir, fix install.sh

With bootstrap files no longer linked to config directory, we can have
an easier directory structure with less nesting for them. Install.sh
needs to use the new structure when calling its bootstrap scripts.
This commit is contained in:
Marty Oehme 2019-12-30 11:04:54 +01:00
parent dba47b8e20
commit 6fd8fcf8ca
4 changed files with 6 additions and 5 deletions

View File

@ -49,15 +49,16 @@ install() {
fi
echo "====================== BEGINNING INSTALLATION ============================="
if ! "$unattended"; then
export BOOTSTRAP_PACKAGES="bootstrap/.config/bootstrap/packages.csv"
./bootstrap/.config/bootstrap/install_packages.sh
export BOOTSTRAP_PACKAGES="bootstrap/packages.csv"
./bootstrap/install_packages.sh
else
export BOOTSTRAP_PACKAGES="bootstrap/.config/bootstrap/packages.csv"
./bootstrap/.config/bootstrap/install_packages.sh -f
export BOOTSTRAP_PACKAGES="bootstrap/packages.csv"
./bootstrap/install_packages.sh -f
fi
unset BOOTSTRAP_PACKAGES
echo "=================== BEGINNING DOTFILE MANAGEMENT =========================="
./bootstrap/.config/bootstrap/autostow.sh -s
./bootstrap/autostow.sh -s
echo "====================== INSTALLATION FINISHED =============================="