From 0c6024b417b2e80ab4a0b3fb3e5341298b849338 Mon Sep 17 00:00:00 2001
From: Ksawlii <ksawery.blaszczak@proton.me>
Date: Wed, 22 Jan 2025 11:09:49 +0100
Subject: [PATCH] build: Tweak variables

---
 kernel_build/build-fireasf.sh | 78 +++++++++++------------------------
 1 file changed, 25 insertions(+), 53 deletions(-)

diff --git a/kernel_build/build-fireasf.sh b/kernel_build/build-fireasf.sh
index 0f569148e..de894859e 100755
--- a/kernel_build/build-fireasf.sh
+++ b/kernel_build/build-fireasf.sh
@@ -1,5 +1,20 @@
 #!/bin/bash
+# FireAsf Variables
 FIRE_VERSION="5.0"
+FIRE_VARIANT="Testing223"
+FIRE_MAINTAINER="Ksawlii"
+FIRE_KBUILD="KBUILD_BUILD_USER=${FIRE_MAINTAINER} KBUILD_BUILD_HOST=FireAsFuck"
+if [ "FIREASF_VANILLA" = "true" ]; then
+  FIRE_TYPE="Vanilla"
+  FIRE_LOCALVERSION="LOCALVERSION=-FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}"
+  KERNELZIP="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}-${HOUR}.zip"
+  KERNELTAR="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}-${HOUR}.tar"
+else
+  FIRE_TYPE="KernelSU-Next"
+  FIRE_LOCALVERSION="LOCALVERSION=-FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}"
+  KERNELZIP="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}-${HOUR}.zip"
+  KERNELTAR="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-${FIRE_TYPE}-${FIRE_VARIANT}-${HOUR}.tar"
+fi
 
 set -e
 
@@ -38,25 +53,11 @@ MONTH=$(date +%m)
 YEAR=$(date +%Y)
 HOUR=$(date +%H.%M) # Current hour in 24-hour format
 
-if [ "FIREASF_VANILLA" = "true" ]; then
-OUT_VANILLA_KERNELZIP="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-Vanilla-Testing233-${HOUR}.zip"
-OUT_VANILLA_KERNELTAR="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-Vanilla-Testing233-${HOUR}.tar"
-else
-OUT_KSUNEXT_KERNELZIP="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-KernelSU-Next-Testing233-${HOUR}.zip"
-OUT_KSUNEXT_KERNELTAR="$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR/FireAsf-${FIRE_VERSION}-KernelSU-Next-Testing233-${HOUR}.tar"
-fi
 OUT_KERNEL="$OUTDIR/arch/arm64/boot/Image"
 OUT_BOOTIMG="$(pwd)/kernel_build/zip/boot.img"
 OUT_VENDORBOOTIMG="$(pwd)/kernel_build/zip/vendor_boot.img"
 OUT_DTBIMAGE="$TMPDIR/dtb.img"
 
-# Kernel-side
-if [ "FIREASF_VANILLA" = "true" ]; then
-VANILLA_ARGS="LOCALVERSION=-FireAsf-${FIRE_VERSION}-Vanilla-TestingFr KBUILD_BUILD_USER=Ksawlii KBUILD_BUILD_HOST=FireAsFuck"
-else
-KSUNEXT_ARGS="LOCALVERSION=-FireAsf-${FIRE_VERSION}-KernelSU-Next-TestingFr KBUILD_BUILD_USER=Ksawlii KBUILD_BUILD_HOST=FireAsFuck"
-fi
-
 kfinish() {
     rm -rf "$TMPDIR"
     rm -rf "$MODULES_OUTDIR"
@@ -89,15 +90,10 @@ echo ""
 echo -e "Check in btop, htop, top (whatever you use) if its building.
 If you have some errors when trying to rebuild, delete $OUTDIR"
 
-if [ "FIREASF_VANILLA" = "true" ]; then
-make -j$(nproc --all) -C $(pwd) O=out $VANILLA_ARGS a53x_defconfig >/dev/null
-make -j$(nproc --all) -C $(pwd) O=out $VANILLA_ARGS dtbs >/dev/null
-make -j$(nproc --all) -C $(pwd) O=out $VANILLA_ARGS >/dev/null
-else
-make -j$(nproc --all) -C $(pwd) O=out $KSUNEXT_ARGS a53x-ksu_defconfig >/dev/null
-make -j$(nproc --all) -C $(pwd) O=out $KSUNEXT_ARGS dtbs >/dev/null
-make -j$(nproc --all) -C $(pwd) O=out $KSUNEXT_ARGS >/dev/null
-fi
+
+make -j$(nproc --all) -C $(pwd) O=out $FIRE_LOCALVERSION $FIRE_KBUILD a53x_defconfig >/dev/null
+make -j$(nproc --all) -C $(pwd) O=out $FIRE_LOCALVERSION $FIRE_KBUILD dtbs >/dev/null
+make -j$(nproc --all) -C $(pwd) O=out $FIRE_LOCALVERSION $FIRE_KBUILD >/dev/null
 make -j$(nproc --all) -C $(pwd) O=out INSTALL_MOD_STRIP="--strip-debug --keep-section=.ARM.attributes" INSTALL_MOD_PATH="$MODULES_OUTDIR" modules_install >/dev/null
 
 rm -rf "$TMPDIR"
@@ -184,47 +180,23 @@ cd "$DIR"
 echo "Building a flashable zip file (Recovery)..."
 mkdir -p "$(pwd)/kernel_build/FireAsf/$DAY_MONTH.$MONTH.$YEAR"
 cd "$(pwd)/kernel_build/zip"
-if [ "FIREASF_VANILLA" = "true" ]; then
-rm -f "$OUT_VANILLA_KERNELZIP"
-else
-rm -f "$OUT_KSUNEXT_KERNELZIP"
-fi
+rm -f "$KERNELZIP"
 brotli --quality=11 -c boot.img > boot.br
 brotli --quality=11 -c vendor_boot.img > vendor_boot.br
-if [ "FIREASF_VANILLA" = "true" ]; then
-zip -r9 -q "$OUT_VANILLA_KERNELZIP" META-INF boot.br vendor_boot.br
-else
-zip -r9 -q "$OUT_KSUNEXT_KERNELZIP" META-INF boot.br vendor_boot.br
-fi
+zip -r9 -q "$KERNELZIP" META-INF boot.br vendor_boot.br
 rm -f boot.br vendor_boot.br
 cd "$DIR"
-if [ "FIREASF_VANILLA" = "true" ]; then
-echo "Done! Output: $OUT_VANILLA_KERNELZIP"
-else
-echo "Done! Output: $OUT_KSUNEXT_KERNELZIP"
-fi
+echo "Done! Output: $KERNELZIP"
 
 echo "Building a flashable tar file (Download Mode)..."
 cd "$(pwd)/kernel_build"
-if [ "FIREASF_VANILLA" = "true" ]; then
-rm -f "$OUT_VANILLA_KERNELTAR"
-else
-rm -f "$OUT_KSUNEXT_KERNELTAR"
-fi
+rm -f "$KERNELTAR"
 lz4 -c -12 -B6 --content-size "$OUT_BOOTIMG" > boot.img.lz4
 lz4 -c -12 -B6 --content-size "$OUT_VENDORBOOTIMG" > vendor_boot.img.lz4
-if [ "FIREASF_VANILLA" = "true" ]; then
-tar -cf "$OUT_VANILLA_KERNELTAR" boot.img.lz4 vendor_boot.img.lz4
-else
-tar -cf "$OUT_KSUNEXT_KERNELTAR" boot.img.lz4 vendor_boot.img.lz4
-fi
+tar -cf "$KERNELTAR" boot.img.lz4 vendor_boot.img.lz4
 cd "$DIR"
 rm -f boot.img.lz4 vendor_boot.img.lz4
-if [ "FIREASF_VANILLA" = "true" ]; then
-echo "Done! Output: $OUT_VANILLA_KERNELTAR"
-else
-echo "Done! Output: $OUT_KSUNEXT_KERNELTAR"
-fi
+echo "Done! Output: $KERNELTAR"
 
 echo "Cleaning..."
 rm -f "${OUT_VENDORBOOTIMG}" "${OUT_BOOTIMG}"