From b5622b12d07f4d7b2f84ba9002b0181f0dbaf89b Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Mon, 8 Apr 2024 15:12:04 +0530
Subject: [PATCH] build: Remove exporting build number/date

---
 build-community.sh | 23 +++--------------------
 src/build.sh       | 23 +++--------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/build-community.sh b/build-community.sh
index 78de3c4..7743653 100755
--- a/build-community.sh
+++ b/build-community.sh
@@ -224,14 +224,6 @@ for branch in ${BRANCH_NAME//,/ }; do
       fi
     fi
 
-    # Remove build number and date on builds.
-    if [ -f out/build_date.txt ]; then
-      rm out/build_date.txt
-    fi
-    if [ -f out/soong/build_number.txt ]; then
-      rm out/soong/build_number.txt
-    fi
-
     # Prepare the environment
     echo ">> [$(date)] Preparing build environment"
     source build/envsetup.sh >/dev/null
@@ -320,16 +312,6 @@ for branch in ${BRANCH_NAME//,/ }; do
         echo ">> [$(date)] Switch to Python2"
         ln -fs /usr/bin/python2 /usr/bin/python
 
-        export BUILD_DATETIME=$(date -u +%s)
-        export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d)${CI_PIPELINE_ID}
-
-        export BUILD_USERNAME=eos
-        export BUILD_HOSTNAME=eos
-        export DISPLAY_BUILD_NUMBER=true
-
-        echo ">> [$(date)] BUILD_DATETIME=$BUILD_DATETIME"
-        echo ">> [$(date)] BUILD_NUMBER=$BUILD_NUMBER"
-
         if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then
           PRODUCT_PRERELEASE=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-(beta|alpha|rc).*/\2/')
           export PRODUCT_PRERELEASE
@@ -369,6 +351,7 @@ for branch in ${BRANCH_NAME//,/ }; do
           echo ">> [$(date)] Starting signing target-files-package"
 
           # Set the target files name
+          BUILD_NUMBER=$(date -u +%Y%m%d)${CI_PIPELINE_ID}
           TARGET_FILES=lineage_$DEVICE-target_files-$BUILD_NUMBER.zip
           E_BRANCH_NAME=$e_ver-${branch_dir,,}
           if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then
@@ -395,9 +378,9 @@ for branch in ${BRANCH_NAME//,/ }; do
             done
           fi
 
-          if [ -f "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_FILES" ]; then
+          if [ "$(find $OUT/obj/PACKAGING/target_files_intermediates/ -name *-target_files*.zip -print -quit)" ]; then
             sign_target_files_apks "${SIGN_TARGETS[@]}" \
-              "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_FILES" "$OUT/$TARGET_FILES"
+              $OUT/obj/PACKAGING/target_files_intermediates/*-target_files*.zip "$OUT/$TARGET_FILES"
 
             if [ "$SIGN_BUILDS" = true ]; then
               SIGN_KEY=(-k "user-keys/releasekey")
diff --git a/src/build.sh b/src/build.sh
index 9d28848..ce695b3 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -198,14 +198,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
     fi
   fi
 
-  # Remove build number and date on builds.
-  if [ -f out/build_date.txt ]; then
-    rm out/build_date.txt
-  fi
-  if [ -f out/soong/build_number.txt ]; then
-    rm out/soong/build_number.txt
-  fi
-
   # Prepare the environment
   echo ">> [$(date)] Preparing build environment"
   source build/envsetup.sh >/dev/null
@@ -279,16 +271,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       BRUNCH_DEVICE=lineage_${DEVICE}-userdebug
     fi
 
-    export BUILD_DATETIME=$(date -u +%s)
-    export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d)${CI_PIPELINE_ID}
-
-    export BUILD_USERNAME=eos
-    export BUILD_HOSTNAME=eos
-    export DISPLAY_BUILD_NUMBER=true
-
-    echo ">> [$(date)] BUILD_DATETIME=$BUILD_DATETIME"
-    echo ">> [$(date)] BUILD_NUMBER=$BUILD_NUMBER"
-
     if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then
       PRODUCT_PRERELEASE=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-(beta|alpha|rc).*/\2/')
       export PRODUCT_PRERELEASE
@@ -321,6 +303,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       echo ">> [$(date)] Starting signing target-files-package"
 
       # Set the target files name
+      BUILD_NUMBER=$(date -u +%Y%m%d)${CI_PIPELINE_ID}
       TARGET_FILES=lineage_$DEVICE-target_files-$BUILD_NUMBER.zip
       E_BRANCH_NAME=$e_ver-${branch_dir,,}
       if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then
@@ -347,9 +330,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         done
       fi
 
-      if [ -f "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_FILES" ]; then
+      if [ "$(find $OUT/obj/PACKAGING/target_files_intermediates/ -name *-target_files*.zip -print -quit)" ]; then
         sign_target_files_apks "${SIGN_TARGETS[@]}" \
-          "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_FILES" "$OUT/$TARGET_FILES"
+          $OUT/obj/PACKAGING/target_files_intermediates/*-target_files*.zip "$OUT/$TARGET_FILES"
 
         # Generate OTA zip
         echo ">> [$(date)] Generating OTA zip from target-files-package"
-- 
GitLab