From 4d9d8adc32fecf3982a6441ff6993f3b08ea89ac Mon Sep 17 00:00:00 2001
From: Jim Wu <mlgmxyysd@meowcat.org>
Date: Tue, 7 Apr 2020 11:52:30 +0800
Subject: [PATCH] Determine whether random files exist

....if exist, regenerate
---
 edxp-core/template_override/customize.sh | 50 ++++++++++++++++++++----
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/edxp-core/template_override/customize.sh b/edxp-core/template_override/customize.sh
index 598689a1..8cae487b 100644
--- a/edxp-core/template_override/customize.sh
+++ b/edxp-core/template_override/customize.sh
@@ -1,7 +1,29 @@
 SKIPUNZIP=1
 
+getRandomNameExist() {
+    RAND_PATH=$4
+    RAND_SUFFIX=$3
+    RAND_PREFIX=$2
+    RAND_DIGIT=$1
+    RAND_RAND="$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-"${RAND_DIGIT}")"
+    RAND_PATH_EXIST=false
+    for TARGET in ${RAND_PATH}; do
+        if [[ -e "${TARGET}/${RAND_PREFIX}${RAND_RAND}${RAND_SUFFIX}" ]]; then
+            RAND_PATH_EXIST=true
+        fi
+    done
+    if [[ "${RAND_PATH_EXIST}" == true ]]; then
+        getRandomNameExist "${RAND_DIGIT}" "${RAND_PREFIX}" "${RAND_SUFFIX}" "${RAND_PATH}"
+    else
+        echo "${RAND_RAND}"
+    fi
+}
+
 RIRU_PATH="/data/misc/riru"
-RIRU_EDXP="$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-4)"
+RIRU_EDXP="$(getRandomNameExist 4 "libriru_" ".so" "
+/system/lib
+/system/lib64
+")"
 RIRU_MODULES="${RIRU_PATH}/modules"
 RIRU_TARGET="${RIRU_MODULES}/${RIRU_EDXP}"
 
@@ -14,13 +36,27 @@ PROP_PRODUCT=$(getprop ro.build.product)
 PROP_BRAND=$(getprop ro.product.brand)
 PROP_MANUFACTURER=$(getprop ro.product.manufacturer)
 
-JAR_EDXP=$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-8)".jar"
-JAR_EDDALVIKDX=$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-8)".jar"
-JAR_EDDEXMAKER=$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-8)".jar"
-JAR_EDCONFIG=$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-8)".jar"
+JAR_EDXP="$(getRandomNameExist 8 "" ".jar" "
+/system/framework
+").jar"
+JAR_EDDALVIKDX="$(getRandomNameExist 8 "" ".jar" "
+/system/framework
+").jar"
+JAR_EDDEXMAKER="$(getRandomNameExist 8 "" ".jar" "
+/system/framework
+").jar"
+JAR_EDCONFIG="$(getRandomNameExist 8 "" ".jar" "
+/system/framework
+").jar"
 LIB_RIRU_EDXP="libriru_${RIRU_EDXP}.so"
-LIB_WHALE_EDXP="lib$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-10).so"
-LIB_SANDHOOK_EDXP="lib$(cat /proc/sys/kernel/random/uuid|md5sum|cut -c 1-13).so"
+LIB_WHALE_EDXP="lib$(getRandomNameExist 10 "lib" ".so" "
+/system/lib
+/system/lib64
+").so"
+LIB_SANDHOOK_EDXP="lib$(getRandomNameExist 13 "lib" ".so" "
+/system/lib
+/system/lib64
+").so"
 
 MODEL="
 HD1900