Skip to content

Commit 32d9e90

Browse files
getActivitygetActivity
committed
修复无法识别大写文件后缀名的问题
1 parent 7f0b77a commit 32d9e90

File tree

18 files changed

+30
-30
lines changed

18 files changed

+30
-30
lines changed

‎shell/device-tools/InstallApp.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ waitUserInputParameter() {
4444
exit 1
4545
fi
4646
elif [[ -f "${sourcePath}" ]]; then
47-
if [[ ! "${sourcePath}" =~ \.(apk|apks|xapk|apkm)$ ]]; then
47+
if [[ ! "${sourcePath}" =~ \.([Aa][Pp][Kk]|[Aa][Pp][Kk][Ss]|[Xx][Aa][Pp][Kk]|[Aa][Pp][Kk][Mm])$ ]]; then
4848
echo "❌ 文件错误，只接受后缀为 apk/apks/xapk/apkm 的文件"
4949
exit 1
5050
fi
@@ -191,22 +191,22 @@ findApkPathForDir() {
191191
continue
192192
fi
193193
printf '%s\0' "$p"
194-
done < <(find "${dir}" -type f -name "*.apk" -print0)
194+
done < <(find "${dir}" -type f -iname "*.apk" -print0)
195195
}
196196

197197
installMultipleApk() {
198198
local deviceId=$1
199199
local successCount=0
200200
local failCount=0
201201
for filePath in "${packageFiles[@]}"; do
202-
if [[ "${filePath}" =~ \.apk$ ]]; then
202+
if [[ "${filePath}" =~ \.([Aa][Pp][Kk])$ ]]; then
203203
installSingleApk "${deviceId}" "${filePath}"
204-
elif [[ "${filePath}" =~ \.apks$ ]]; then
204+
elif [[ "${filePath}" =~ \.([Aa][Pp][Kk][Ss])$ ]]; then
205205
installApksWithBundletool "${deviceId}" "${filePath}"
206-
elif [[ "${filePath}" =~ \.(xapk|apkm)$ ]]; then
206+
elif [[ "${filePath}" =~ \.([Xx][Aa][Pp][Kk]|[Aa][Pp][Kk][Mm])$ ]]; then
207207
local tempDirPath
208208
tempDirPath=$(unzipFileToTempDir "${filePath}")
209-
if [[ "${filePath}" =~ \.xapk$ ]]; then
209+
if [[ "${filePath}" =~ \.([Xx][Aa][Pp][Kk])$ ]]; then
210210
maybePushObb "${deviceId}" "${tempDirPath}"
211211
fi
212212
installMultipleApkFromDir "${deviceId}" "${tempDirPath}" "${filePath}"

‎shell/device-tools/flash/FlashRecovery.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ flashRecoveryForDevice() {
3838
return 1
3939
fi
4040

41-
if [[ ! "${recoveryFilePath}" =~ \.(img)$ ]]; then
41+
if [[ ! "${recoveryFilePath}" =~ \.([Ii][Mm][Gg])$ ]]; then
4242
echo "❌ 文件错误，只接受文件名后缀为 img 的文件"
4343
exit 1
4444
fi

‎shell/device-tools/flash/FlashTempRecovery.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ flashTempRecoveryForDevice() {
8787
return 1
8888
fi
8989

90-
if [[ ! "${recoveryFilePath}" =~ \.(img)$ ]]; then
90+
if [[ ! "${recoveryFilePath}" =~ \.([Ii][Mm][Gg])$ ]]; then
9191
echo "❌ 文件错误，只接受文件名后缀为 img 的文件"
9292
exit 1
9393
fi

‎shell/package-tools/AabToApks.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ waitUserInputParameter() {
3636
exit 1
3737
fi
3838

39-
if [[ ! "${aabFilePath}" =~ \.aab$ ]]; then
39+
if [[ ! "${aabFilePath}" =~ \.([Aa][Aa][Bb])$ ]]; then
4040
echo "❌ 输入无效，只接受以 .aab 结尾的文件"
4141
exit 1
4242
fi
@@ -72,7 +72,7 @@ main() {
7272
checkJavaElevenEnvironment
7373
waitUserInputParameter "$1"
7474
local apksFilePath
75-
apksFilePath="$(dirname "${aabFilePath}")/$(basename "${aabFilePath}" .aab).apks"
75+
apksFilePath="$(dirname "${aabFilePath}")/$(basename "${aabFilePath%.*}").apks"
7676
apksFileSuffix="-$(date "+%Y%m%d%H%M%S")"
7777
if [[ -f "${apksFilePath}" ]]; then
7878
apksFilePath="${apksFilePath%.*}${apksFileSuffix}.${apksFilePath##*.}"

‎shell/package-tools/AndroidXToSupport.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ main() {
2929
exit 1
3030
fi
3131

32-
if [[ ! "${androidXFilePath}" =~ \.(aar|jar|zip)$ ]]; then
32+
if [[ ! "${androidXFilePath}" =~ \.([Aa][Aa][Rr]|[Jj][Aa][Rr]|[Zz][Ii][Pp])$ ]]; then
3333
echo "❌ 文件错误，只支持文件名后缀为 aar / jar / zip 包的文件"
3434
exit 1
3535
fi

‎shell/package-tools/CompareArchives.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ main() {
2727
echo "文件不存在，请检查 ${oldLibraryFilePath} 文件路径是否正确"
2828
exit 1
2929
fi
30-
if [[ ! "${oldLibraryFilePath}" =~ \.(apk|aar|jar|aab)$ ]]; then
30+
if [[ ! "${oldLibraryFilePath}" =~ \.([Aa][Pp][Kk]|[Aa][Aa][Rr]|[Jj][Aa][Rr]|[Aa][Aa][Bb])$ ]]; then
3131
echo "文件错误，只支持文件名后缀为 apk, aar, jar, aab 包的文件"
3232
exit 1
3333
fi
@@ -39,7 +39,7 @@ main() {
3939
echo "文件不存在，请检查 ${newLibraryFilePath} 文件路径是否正确"
4040
exit 1
4141
fi
42-
if [[ ! "${newLibraryFilePath}" =~ \.(apk|aar|jar|aab)$ ]]; then
42+
if [[ ! "${newLibraryFilePath}" =~ \.([Aa][Pp][Kk]|[Aa][Aa][Rr]|[Jj][Aa][Rr]|[Aa][Aa][Bb])$ ]]; then
4343
echo "文件错误，只支持文件名后缀为 apk, aar, jar, aab 包的文件"
4444
exit 1
4545
fi

‎shell/package-tools/GetApkSignature.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ main() {
2929
exit 1
3030
fi
3131

32-
if [[ ! "${sourceApkFilePath}" =~ \.(apk)$ ]]; then
32+
if [[ ! "${sourceApkFilePath}" =~ \.([Aa][Pp][Kk])$ ]]; then
3333
echo "❌ 文件错误，只能验证文件名后缀为 apk 的文件"
3434
exit 1
3535
fi
@@ -47,7 +47,7 @@ main() {
4747
exit 1
4848
fi
4949

50-
if [[ ! "${apkSignerJarFilePath}" =~ \.(jar)$ ]]; then
50+
if [[ ! "${apkSignerJarFilePath}" =~ \.([Jj][Aa][Rr])$ ]]; then
5151
echo "❌ 文件错误，apksigner 文件名后缀只能是 jar 结尾"
5252
exit 1
5353
fi

‎shell/package-tools/SignatureApk.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ waitUserInputParameter() {
3333
if [[ -d "${sourcePath}" ]]; then
3434
while IFS= read -r -d '' file; do
3535
apkFiles+=("${file}")
36-
done < <(find "${sourcePath}" -maxdepth 1 -type f -name "*.apk" -print0)
36+
done < <(find "${sourcePath}" -maxdepth 1 -type f -iname "*.apk" -print0)
3737
if (( ${#apkFiles[@]} == 0 )); then
3838
echo "❌ 该目录下没有以 .apk 结尾的文件，签名中止"
3939
exit 1
4040
fi
4141
elif [[ -f "${sourcePath}" ]]; then
42-
if [[ ! "${sourcePath}" =~ \.(apk)$ ]]; then
42+
if [[ ! "${sourcePath}" =~ \.([Aa][Pp][Kk])$ ]]; then
4343
echo "❌ 文件错误，只接受文件名后缀为 apk 的文件"
4444
exit 1
4545
fi
@@ -97,7 +97,7 @@ waitUserInputParameter() {
9797
echo "❌ 文件不存在，请检查 ${apkSignerJarFilePath} 文件路径是否正确"
9898
exit 1
9999
fi
100-
if [[ ! "${apkSignerJarFilePath}" =~ \.(jar)$ ]]; then
100+
if [[ ! "${apkSignerJarFilePath}" =~ \.([Jj][Aa][Rr])$ ]]; then
101101
echo "❌ 文件错误，apksigner 文件名后缀只能是 jar 结尾"
102102
exit 1
103103
fi

‎shell/package-tools/SupportToAndroidX.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ main() {
2929
exit 1
3030
fi
3131

32-
if [[ ! "${supportFilePath}" =~ \.(aar|jar|zip)$ ]]; then
32+
if [[ ! "${supportFilePath}" =~ \.([Aa][Aa][Rr]|[Jj][Aa][Rr]|[Zz][Ii][Pp])$ ]]; then
3333
echo "❌ 文件错误，只支持文件名后缀为 aar / jar / zip 包的文件"
3434
exit 1
3535
fi

‎shell/reverse-tools/apktool/DecompileApk.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ waitUserInputParameter() {
2626
exit 1
2727
fi
2828

29-
if [[ ! "${sourceApkFilePath}" =~ \.(apk)$ ]]; then
29+
if [[ ! "${sourceApkFilePath}" =~ \.([Aa][Pp][Kk])$ ]]; then
3030
echo "❌ 文件错误，只能反编译文件名后缀为 apk 的文件"
3131
exit 1
3232
fi

0 commit comments

Comments
 (0)