From e0f726b1da9cd382882c5b0cab12e49f53680dad Mon Sep 17 00:00:00 2001
From: Levon Gevorgyan <lgevorgyan03@gmail.com>
Date: Sat, 26 Apr 2025 12:28:44 -0500
Subject: [PATCH] clean up CLEAN (yes, I know)

---
 scripts/build.sh  | 29 ++++++++++++++---------------
 scripts/common.sh |  1 +
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index b28127b..de903d2 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -35,10 +35,10 @@ set_compile_opts() {
 
     # enabling a clean build
     if test "$(jq .clean "${COMPILE_CFG}")" == 'true'; then
-        CLEAN='make clean ;'
+        CLEAN="${SUDO} rm -rf"
         echo_info "performing clean build"
     else
-        CLEAN=''
+        CLEAN='void'
     fi
 
     # enabling link-time optimization
@@ -165,6 +165,7 @@ download_release() {
         if [[ "${wrong_ver_dl}" =~ ${base_path} ]]; then
             continue
         fi
+        test -f "${wrong_ver_dl}" || continue
         echo_warn "removing wrong version: ${wrong_ver_dl}"
         rm -rf "${wrong_ver_dl}"
     done
@@ -173,10 +174,15 @@ download_release() {
         if [[ "${wrong_ver_build}" =~ ${base_path} ]]; then
             continue
         fi
+        test -d "${wrong_ver_build}" || continue
         echo_warn "removing wrong version: ${extracted_dir}"
         rm -rf "${wrong_ver_build}"
     done
 
+    # create new build dir for clean builds
+    test -d "${extracted_dir}" && \
+        ${CLEAN} "${extracted_dir}"
+
     if test "${ext}" != "git"; then
         wget_out="${base_dl_path}.${ext}"
         
@@ -194,10 +200,12 @@ download_release() {
         }
     else
         # for git downloads
-        test -d "${base_dl_path}" || {
+        test -d "${base_dl_path}" || \
             git clone "${url}" "${base_dl_path}" || return 1
+
+        # create new build directory
+        test -d "${extracted_dir}" || \
             cp -r "${base_dl_path}" "${extracted_dir}" || return 1
-        }
     fi
 }
 
@@ -253,9 +261,8 @@ build() {
 }
 
 build_hdr10plus_tool() {
-    test "${CLEAN}" != '' && cargo clean
     ccache cargo build --release
-    test -d "${PREFIX}/bin/" || mkdir "${PREFIX}/bin/"
+    test -d "${PREFIX}/bin/" || ${SUDO} mkdir "${PREFIX}/bin/"
     ${SUDO} cp target/release/hdr10plus_tool "${PREFIX}/bin/" || return 1
 
     # build libhdr10plus
@@ -265,9 +272,8 @@ build_hdr10plus_tool() {
 }
 
 build_dovi_tool() {
-    test "${CLEAN}" != '' && cargo clean
     ccache cargo build --release
-    test -d "${PREFIX}/bin/" || mkdir "${PREFIX}/bin/"
+    test -d "${PREFIX}/bin/" || ${SUDO} mkdir "${PREFIX}/bin/"
     ${SUDO} cp target/release/dovi_tool "${PREFIX}/bin/" || return 1
 
     # build libdovi
@@ -277,7 +283,6 @@ build_dovi_tool() {
 }
 
 build_libsvtav1_psy() {
-    ${SUDO} ${CLEAN}
     cmake \
         "${CMAKE_FLAGS[@]}" \
         -DSVT_AV1_LTO="${LTO_SWITCH}" \
@@ -291,7 +296,6 @@ build_libsvtav1_psy() {
 }
 
 build_libopus() {
-    ${SUDO} ${CLEAN}
     ./configure \
         "${CONFIGURE_FLAGS[@]}" || return 1
     ccache make -j"${JOBS}" || return 1
@@ -300,10 +304,6 @@ build_libopus() {
 }
 
 build_libdav1d() {
-    test "${CLEAN}" != '' && {
-        ${SUDO} rm -rf build.user
-        mkdir build.user
-    }
     meson \
         setup . build.user \
         "${MESON_FLAGS[@]}" \
@@ -319,7 +319,6 @@ build_ffmpeg() {
         test "${enable}" == 'libsvtav1_psy' && enable='libsvtav1'
         CONFIGURE_FLAGS+=("--enable-${enable}")
     done
-    ${SUDO} $CLEAN
     ./configure \
         "${CONFIGURE_FLAGS[@]}" \
         "${FFMPEG_EXTRA_FLAGS[@]}" \
diff --git a/scripts/common.sh b/scripts/common.sh
index e95ff63..b8d32b7 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -15,6 +15,7 @@ echo_info() { echo -e "${CYAN}INFO${NC}:" "$@" ; }
 echo_pass() { echo -e "${GREEN}PASS${NC}:" "$@" ; }
 echo_warn() { echo -e "${YELLOW}WARN${NC}:" "$@" ; }
 echo_exit() { echo_fail "$@" ; exit 1 ; }
+void() { echo "$@" >/dev/null ; }
 
 echo_if_fail() {
     local cmd=("$@")