优化逆向文件格式互转脚本生成的文件名称

Author: getActivity

shell/reverse-tools/convert/dex-class/ClassToDex.sh

@@ -65,9 +65,19 @@ main() {
     fi
 
     if [[ -d "${inputPath}" ]]; then
-        outputDex="${classesDirPath%/}-class2dex-$(date "+%Y%m%d%H%M%S").dex"
+        outputDex="${classesDirPath%/}.dex"
     else
-        outputDex="${inputPath%.*}-class2dex-$(date "+%Y%m%d%H%M%S").dex"
+        outputDex="${inputPath%.*}.dex"
+    fi
+    class2dexNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${outputDex}" ]]; then
+        outputDex="${outputDex%.*}${class2dexNameSuffix}.dex"
+    elif [[ -d "${outputDex}" ]]; then
+        if [[ "$(find "${outputDex}" -mindepth 1 | head -1)" ]]; then
+            outputDex="${outputDex%.*}${class2dexNameSuffix}.dex"
+        else
+            rmdir "${outputDex}"
+        fi
     fi
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)dex2jar-2.4$(getFileSeparator)d2j-jar2dex.sh" -f -o "${outputDex}" "${tempJar}" 2>&1)"
     exitCode=$?

shell/reverse-tools/convert/dex-class/DexToClass.sh

@@ -41,8 +41,19 @@ main() {
     fi
 
     tempJar="${inputFilePath%.*}.jar"
-    classesDirPath="${inputFilePath%.*}-dex2class-$(date "+%Y%m%d%H%M%S")"
     echo "中间 jar 路径：${tempJar}"
+
+    classesDirPath="${inputFilePath%.*}"
+    dex2classDirSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${classesDirPath}" ]]; then
+        classesDirPath="${classesDirPath}${dex2classDirSuffix}"
+    elif [[ -d "${classesDirPath}" ]]; then
+        if [[ "$(find "${classesDirPath}" -mindepth 1 | head -1)" ]]; then
+            classesDirPath="${classesDirPath}${dex2classDirSuffix}"
+        else
+            rmdir "${classesDirPath}"
+        fi
+    fi
     echo "classes 输出目录：${classesDirPath}"
 
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)dex2jar-2.4$(getFileSeparator)d2j-dex2jar.sh" -f -o "${tempJar}" "${inputFilePath}" 2>&1)"

shell/reverse-tools/convert/dex-smali/DexToSmali.sh

@@ -40,13 +40,16 @@ main() {
         exit 1
     fi
 
-    echo "请输入 smali 输出目录（可空，默认为同名 -dex2smali 目录）"
-    read -r outputSmaliDirPath
-    outputSmaliDirPath=$(parseComputerFilePath "${outputSmaliDirPath}")
-
-    if [[ -z "${outputSmaliDirPath}" ]]; then
-        base="${inputDexFilePath%.*}"
-        outputSmaliDirPath="${base}-dex2smali-$(date "+%Y%m%d%H%M%S")"
+    outputSmaliDirPath="${inputDexFilePath%.*}"
+    dex2smaliDirSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${outputSmaliDirPath}" ]]; then
+        outputSmaliDirPath="${outputSmaliDirPath}${dex2smaliDirSuffix}"
+    elif [[ -d "${outputSmaliDirPath}" ]]; then
+        if [[ "$(find "${outputSmaliDirPath}" -mindepth 1 | head -1)" ]]; then
+            outputSmaliDirPath="${outputSmaliDirPath}${dex2smaliDirSuffix}"
+        else
+            rmdir "${outputSmaliDirPath}"
+        fi
     fi
 
     outputPrint="$(java -jar "${resourcesDirPath}$(getFileSeparator)baksmali-2.5.2.jar" d "${inputDexFilePath}" -o "${outputSmaliDirPath}" 2>&1)"

shell/reverse-tools/convert/dex-smali/SmaliToDex.sh

@@ -35,12 +35,16 @@ main() {
         exit 1
     fi
 
-    echo "请输入生成的 dex 文件路径（可空，默认同名 .dex）："
-    read -r outputDexFilePath
-    outputDexFilePath=$(parseComputerFilePath "${outputDexFilePath}")
-
-    if [[ -z "${outputDexFilePath}" ]]; then
-        outputDexFilePath="${inputSmaliDirPath}-smali2dex-$(date "+%Y%m%d%H%M%S").dex"
+    outputDexFilePath="${inputSmaliDirPath%/}.dex"
+    smali2dexNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${outputDexFilePath}" ]]; then
+        outputDexFilePath="${outputDexFilePath%.*}${smali2dexNameSuffix}.dex"
+    elif [[ -d "${outputDexFilePath}" ]]; then
+        if [[ "$(find "${outputDexFilePath}" -mindepth 1 | head -1)" ]]; then
+            outputDexFilePath="${outputDexFilePath%.*}${smali2dexNameSuffix}.dex"
+        else
+            rmdir "${outputDexFilePath}"
+        fi
     fi
 
     outputPrint="$(java -jar "${resourcesDirPath}$(getFileSeparator)smali-2.5.2.jar" a "${inputSmaliDirPath}" -o "${outputDexFilePath}" 2>&1)"

shell/reverse-tools/convert/jar-dex/DexToJar.sh

@@ -40,7 +40,17 @@ main() {
         exit 1
     fi
 
-    outputFilePath="${inputFilePath%.*}-dex2jar-$(date "+%Y%m%d%H%M%S").jar"
+    outputFilePath="${inputFilePath%.*}.jar"
+    dex2jarNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${outputFilePath}" ]]; then
+        outputFilePath="${outputFilePath%.*}${dex2jarNameSuffix}.jar"
+    elif [[ -d "${outputFilePath}" ]]; then
+        if [[ "$(find "${outputFilePath}" -mindepth 1 | head -1)" ]]; then
+            outputFilePath="${outputFilePath%.*}${dex2jarNameSuffix}.jar"
+        else
+            rmdir "${outputFilePath}"
+        fi
+    fi
     echo "输出的 jar 文件路径：${outputFilePath}"
 
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)dex2jar-2.4$(getFileSeparator)d2j-dex2jar.sh" -f -o "${outputFilePath}" "${inputFilePath}" 2>&1)"

shell/reverse-tools/convert/jar-dex/JarToDex.sh

@@ -39,7 +39,17 @@ main() {
         exit 1
     fi
 
-    outputFilePath="${inputFilePath%.*}-jar2dex-$(date "+%Y%m%d%H%M%S").dex"
+    outputFilePath="${inputFilePath%.*}.dex"
+    jar2dexNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${outputFilePath}" ]]; then
+        outputFilePath="${outputFilePath%.*}${jar2dexNameSuffix}.dex"
+    elif [[ -d "${outputFilePath}" ]]; then
+        if [[ "$(find "${outputFilePath}" -mindepth 1 | head -1)" ]]; then
+            outputFilePath="${outputFilePath%.*}${jar2dexNameSuffix}.dex"
+        else
+            rmdir "${outputFilePath}"
+        fi
+    fi
     echo "输出的 dex 文件路径：${outputFilePath}"
 
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)dex2jar-2.4$(getFileSeparator)d2j-jar2dex.sh" -f -o "${outputFilePath}" "${inputFilePath}" 2>&1)"