From 42560c04ebb21b0ee4ddbe9812dcf2371f990dee Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Tue, 11 Feb 2020 10:28:20 +0100
Subject: [PATCH] Move bootstrap dir to conform to dotfile structure

Removed underscore from bootstrap directory, since the repository does
not organize itself through underscore prefixes anymore.

Fixed package gathering git-hook to respect new bootstrap directory.
---
 .githooks/prepare-commit-msg                            | 5 +++--
 {_bootstrap => bootstrap}/.config/sh/alias.d/dotlink.sh | 0
 {_bootstrap => bootstrap}/.stow-local-ignore            | 0
 {_bootstrap => bootstrap}/install_packages.sh           | 0
 {_bootstrap => bootstrap}/packages.txt                  | 0
 {_bootstrap => bootstrap}/packages_ignore.txt           | 0
 6 files changed, 3 insertions(+), 2 deletions(-)
 rename {_bootstrap => bootstrap}/.config/sh/alias.d/dotlink.sh (100%)
 rename {_bootstrap => bootstrap}/.stow-local-ignore (100%)
 rename {_bootstrap => bootstrap}/install_packages.sh (100%)
 rename {_bootstrap => bootstrap}/packages.txt (100%)
 rename {_bootstrap => bootstrap}/packages_ignore.txt (100%)

diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg
index cacaa1e..23598c4 100755
--- a/.githooks/prepare-commit-msg
+++ b/.githooks/prepare-commit-msg
@@ -3,8 +3,9 @@
 COMMIT_MSG_FILE="$1"
 COMMIT_SOURCE="$2"
 
-pkgfileloc="$(git rev-parse --show-toplevel)/_bootstrap/packages.txt"
-pkgignoreloc="$(git rev-parse --show-toplevel)/_bootstrap/packages_ignore.txt"
+BOOTSTRAPDIR="bootstrap"
+pkgfileloc="$(git rev-parse --show-toplevel)/$BOOTSTRAPDIR/packages.txt"
+pkgignoreloc="$(git rev-parse --show-toplevel)/$BOOTSTRAPDIR/packages_ignore.txt"
 listgen="yay"
 
 err() {
diff --git a/_bootstrap/.config/sh/alias.d/dotlink.sh b/bootstrap/.config/sh/alias.d/dotlink.sh
similarity index 100%
rename from _bootstrap/.config/sh/alias.d/dotlink.sh
rename to bootstrap/.config/sh/alias.d/dotlink.sh
diff --git a/_bootstrap/.stow-local-ignore b/bootstrap/.stow-local-ignore
similarity index 100%
rename from _bootstrap/.stow-local-ignore
rename to bootstrap/.stow-local-ignore
diff --git a/_bootstrap/install_packages.sh b/bootstrap/install_packages.sh
similarity index 100%
rename from _bootstrap/install_packages.sh
rename to bootstrap/install_packages.sh
diff --git a/_bootstrap/packages.txt b/bootstrap/packages.txt
similarity index 100%
rename from _bootstrap/packages.txt
rename to bootstrap/packages.txt
diff --git a/_bootstrap/packages_ignore.txt b/bootstrap/packages_ignore.txt
similarity index 100%
rename from _bootstrap/packages_ignore.txt
rename to bootstrap/packages_ignore.txt