优化 AndroidX 和 Support 互转脚本生成的文件名称

Author: getActivity

shell/package-tools/AndroidXToSupport.sh

@@ -40,7 +40,17 @@ main() {
         exit 1
     fi
 
-    supportFilePath="${androidXFilePath%.*}-support-$(date "+%Y%m%d%H%M%S").${androidXFilePath##*.}"
+    supportFilePath="${androidXFilePath%.*}-support.${androidXFilePath##*.}"
+    supportNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${supportFilePath}" ]]; then
+        supportFilePath="${supportFilePath%.*}${supportNameSuffix}.${androidXFilePath##*.}"
+    elif [[ -d "${supportFilePath}" ]]; then
+        if [[ "$(find "${supportFilePath}" -mindepth 1 | head -1)" ]]; then
+            supportFilePath="${supportFilePath%.*}${supportNameSuffix}.${androidXFilePath##*.}"
+        else
+            rmdir "${supportFilePath}"
+        fi
+    fi
     echo "support 包的保存路径：${supportFilePath}"
 
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)jetifier-standalone-20200827$(getFileSeparator)bin$(getFileSeparator)jetifier-standalone" -r -i "${androidXFilePath}" -o "${supportFilePath}" 2>&1)"

shell/package-tools/SupportToAndroidX.sh

@@ -40,7 +40,17 @@ main() {
         exit 1
     fi
 
-    androidXFilePath="${supportFilePath%.*}-androidx-$(date "+%Y%m%d%H%M%S").${supportFilePath##*.}"
+    androidXFilePath="${supportFilePath%.*}-androidx.${supportFilePath##*.}"
+    androidxNameSuffix="-$(date "+%Y%m%d%H%M%S")"
+    if [[ -f "${androidXFilePath}" ]]; then
+        androidXFilePath="${androidXFilePath%.*}${androidxNameSuffix}.${supportFilePath##*.}"
+    elif [[ -d "${androidXFilePath}" ]]; then
+        if [[ "$(find "${androidXFilePath}" -mindepth 1 | head -1)" ]]; then
+            androidXFilePath="${androidXFilePath%.*}${androidxNameSuffix}.${supportFilePath##*.}"
+        else
+            rmdir "${androidXFilePath}"
+        fi
+    fi
     echo "androidx 包的保存路径：${androidXFilePath}"
 
     outputPrint="$("${resourcesDirPath}$(getFileSeparator)jetifier-standalone-20200827$(getFileSeparator)bin$(getFileSeparator)jetifier-standalone" -i "${supportFilePath}" -o "${androidXFilePath}" 2>&1)"