From 00726d9684019e9e94ef7c28975b8b382099f616 Mon Sep 17 00:00:00 2001
From: FriendlyNeighborhoodShane <shane.880088.supw@gmail.com>
Date: Thu, 24 Jun 2021 17:37:31 +0530
Subject: [PATCH] build.sh: add $confdir

---
 build.sh | 7 ++++---
 bump.sh  | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 59392f9..3f7bf01 100755
--- a/build.sh
+++ b/build.sh
@@ -14,6 +14,7 @@ abort() {
 }
 
 workdir="$(pwd)";
+confdir="$workdir/conf";
 resdir="$workdir/res";
 resdldir="$workdir/resdl";
 reldir="$workdir/releases";
@@ -40,7 +41,7 @@ if [ "$1" = "all" ]; then
   echo " ";
   echo " - Building all packages...";
   echo " ";
-  for var in $(find "$workdir/conf" -name "defconf-*.txt" | sed -e "s|^$workdir/conf/defconf-||g" -e "s|.txt$||g"); do
+  for var in $(find "$confdir" -name "defconf-*.txt" | sed -e "s|^$confdir/defconf-||g" -e "s|.txt$||g"); do
     echo " - Executing build for $var...";
     "$workdir/build.sh" "$var";
   done;
@@ -57,7 +58,7 @@ elif [ "$#" -gt "1" ]; then
 fi;
 
 confvar="$1";
-[ -f "$workdir/conf/defconf-$confvar.txt" ] || abort "No $confvar variant defconf found";
+[ -f "$confdir/defconf-$confvar.txt" ] || abort "No $confvar variant defconf found";
 
 echo " ";
 echo " - Building package $confvar";
@@ -68,7 +69,7 @@ mkdir -p "$tmpdir";
 
 # Config
 
-cp -f "$workdir/conf/defconf-$confvar.txt" "$tmpdir/defconf";
+cp -f "$confdir/defconf-$confvar.txt" "$tmpdir/defconf";
 . "$tmpdir/defconf" || abort "Config for $confvar cannot be executed";
 
 echo " ";
diff --git a/bump.sh b/bump.sh
index 94dc8a7..cfe7ef9 100755
--- a/bump.sh
+++ b/bump.sh
@@ -13,6 +13,7 @@ abort() {
 }
 
 workdir="$(pwd)";
+confdir="$workdir/conf";
 
 quote_str() {
   printf '"%s"' "$1";
@@ -32,7 +33,7 @@ echo " ";
 echo " - Bumping defconfs: [$1] [$2] [$3]";
 
 for i in "ver=$(quote_str "$1")" "verc=$(quote_str "$2")" "date=$(quote_str "$3")"; do
-  sed -i "s|${i%%=*}=.*|$i;|g" -- "$workdir/conf"/defconf-*.txt;
+  sed -i "s|${i%%=*}=.*|$i;|g" -- "$confdir"/defconf-*.txt;
 done;
 
 echo " ";