From c2fce029fcd9fec00f7eb3cd53ca140ec9ec8280 Mon Sep 17 00:00:00 2001
From: Sunderland93 <samoilov.lex@gmail.com>
Date: Fri, 17 Feb 2023 22:27:23 +0400
Subject: [PATCH] Simplify script

---
 build.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index a97acc7..01f1119 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,10 @@ if [ -n "$1" ]; then
 else
   CONFIG_FILE="etc/terraform.conf"
 fi
+
 BASE_DIR="$PWD"
+TMP_DIR="$BASE_DIR/tmp"
+BUILDS_DIR="$BASE_DIR/builds"
 source "$BASE_DIR"/"$CONFIG_FILE"
 
 echo -e "
@@ -29,11 +32,9 @@ dist="$(lsb_release -i -s)"
 if [ $dist == "Debian" ]; then
   apt-get install -y binutils zstd live-build
   dpkg -i ./debs/ubuntu-keyring*.deb
-elif [ $dist == "Ubuntu" ]; then
+else
   apt-get install -y binutils zstd
   dpkg -i ./debs/*.deb
-else
-  echo "E: Unsupported distribution for building"
 fi
 
 ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/lunar
@@ -41,8 +42,14 @@ ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/luna
 build () {
   BUILD_ARCH="$1"
 
-  mkdir -p "$BASE_DIR/tmp/$BUILD_ARCH"
-  cd "$BASE_DIR/tmp/$BUILD_ARCH" || exit
+  if [ -d "$TMP_DIR" ]; then
+    rm -rf $TMP_DIR
+    mkdir -p "$TMP_DIR/$BUILD_ARCH"
+  else
+    mkdir -p "$TMP_DIR/$BUILD_ARCH"
+  fi
+
+  cd "$TMP_DIR/$BUILD_ARCH" || exit
 
   # remove old configs and copy over new
   rm -rf config auto
@@ -81,7 +88,7 @@ build () {
 "
 
     YYYYMMDD="$(date +%Y%m%d%H%M)"
-    OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
+    OUTPUT_DIR="$BUILDS_DIR/$BUILD_ARCH"
     mkdir -p "$OUTPUT_DIR"
     if [ "$CHANNEL" == dev ]; then
       FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH"
@@ -90,14 +97,14 @@ build () {
     else
       echo -e "Error: invalid channel name!"
     fi
-    mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
+    mv "$TMP_DIR/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
 
     md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
     sha256sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.sha256.txt"
 }
 
 # remove old builds before creating new ones
-rm -rf "$BASE_DIR"/builds
+rm -rf "$BUILDS_DIR"
 
 build "$ARCH"