From 6fd8fcf8ca8256172047bdd715050d8face25622 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Mon, 30 Dec 2019 11:04:54 +0100
Subject: [PATCH] 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.
---
 bootstrap/{.config/bootstrap => }/autostow.sh         |  0
 bootstrap/{.config/bootstrap => }/install_packages.sh |  0
 bootstrap/{.config/bootstrap => }/packages.csv        |  0
 install.sh                                            | 11 ++++++-----
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename bootstrap/{.config/bootstrap => }/autostow.sh (100%)
 rename bootstrap/{.config/bootstrap => }/install_packages.sh (100%)
 rename bootstrap/{.config/bootstrap => }/packages.csv (100%)

diff --git a/bootstrap/.config/bootstrap/autostow.sh b/bootstrap/autostow.sh
similarity index 100%
rename from bootstrap/.config/bootstrap/autostow.sh
rename to bootstrap/autostow.sh
diff --git a/bootstrap/.config/bootstrap/install_packages.sh b/bootstrap/install_packages.sh
similarity index 100%
rename from bootstrap/.config/bootstrap/install_packages.sh
rename to bootstrap/install_packages.sh
diff --git a/bootstrap/.config/bootstrap/packages.csv b/bootstrap/packages.csv
similarity index 100%
rename from bootstrap/.config/bootstrap/packages.csv
rename to bootstrap/packages.csv
diff --git a/install.sh b/install.sh
index a7b03e2..3657192 100755
--- a/install.sh
+++ b/install.sh
@@ -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 =============================="