优化判断用户输入选项的代码写法

getActivity · getActivity · commit b0768c13f74b · 2026-02-11T13:21:40.000+08:00
diff --git a/shell/device-tools/DisplayLogcat.sh b/shell/device-tools/DisplayLogcat.sh
@@ -74,10 +74,10 @@ displayLogcatForDevice() {
         read -r cleanConfirm
         if [[ -z "${cleanConfirm}" ]]; then
             break
-        elif [[ "${cleanConfirm}" == "y" || "${cleanConfirm}" == "Y" ]]; then
+        elif [[ "${cleanConfirm}" =~ ^[yY]$ ]]; then
             adb -s "${deviceId}" logcat -c < /dev/null
             break
-        elif [[ "${cleanConfirm}" == "n" || "${cleanConfirm}" == "N" ]]; then
+        elif [[ "${cleanConfirm}" =~ ^[nN]$ ]]; then
             break
         else
             echo "👻 输入不正确，请输入正确的选项（y/n）"
diff --git a/shell/device-tools/ExportApkFile.sh b/shell/device-tools/ExportApkFile.sh
@@ -24,9 +24,9 @@ waitUserInputParameter() {
     if [[ -z "${targetPackageName}" ]]; then
         echo "是否导出系统应用？（y/n）："
         read -r includeSystemConfirm
-        if [[ "${includeSystemConfirm}" == "y" || "${includeSystemConfirm}" == "Y" ]]; then
+        if [[ "${includeSystemConfirm}" =~ ^[yY]$ ]]; then
             includeSystemApps="true"
-        elif [[ "${includeSystemConfirm}" == "n" || "${includeSystemConfirm}" == "N" ]]; then
+        elif [[ "${includeSystemConfirm}" =~ ^[nN]$ ]]; then
             includeSystemApps="false"
         else
             echo "❌ 无效选择，已取消操作"
diff --git a/shell/device-tools/ManageFile.sh b/shell/device-tools/ManageFile.sh
@@ -646,7 +646,7 @@ removeTarget() {
     local confirmTip="👻 确认删除【${targetType}】${targetName} 吗？(y/n)："
     echo -e "${colorYellow}${confirmTip}${colorReset}"
     read -r confirmInput
-    if [[ "${confirmInput}" != "y" && "${confirmInput}" != "Y" ]]; then
+    if [[ ! "${confirmInput}" =~ ^[yY]$ ]]; then
         echo -e "\n${colorYellow}💡 已取消删除命令：${targetName}${colorReset}"
         return 1
     fi
@@ -947,7 +947,7 @@ pasteTarget() {
          echo -e "${colorYellow}👻 目标位置已存在同名文件/文件夹：${sourceName}${colorReset}"
          echo -e "是否覆盖/合并？(y/n)："
          read -r confirmInput
-         if [[ "${confirmInput}" != "y" && "${confirmInput}" != "Y" ]]; then
+         if [[ ! "${confirmInput}" =~ ^[yY]$ ]]; then
              echo -e "${colorYellow}💡 已取消操作${colorReset}"
              return 1
          fi
diff --git a/shell/device-tools/UninstallApp.sh b/shell/device-tools/UninstallApp.sh
@@ -56,7 +56,7 @@ uninstallSingleApp() {
         echo "💡 [${deviceId}] 设备未安装 ${packageName} 应用，跳过卸载"
         return 2
     fi
-    if [[ ${retainDataChoice} == "y" || ${retainDataChoice} == "Y" ]]; then
+    if [[ ${retainDataChoice} =~ ^[yY]$ ]]; then
         local outputPrint
         outputPrint=$(adb -s "${deviceId}" shell cmd package uninstall -k "${packageName}" < /dev/null 2>&1)
         local exitCode=$?
diff --git a/shell/device-tools/env/KillAdb.sh b/shell/device-tools/env/KillAdb.sh
@@ -19,9 +19,9 @@ killAdbProcess() {
     echo "确定要杀死 adb 进程? （y/n）"
     while true; do
         read -r killConfirm
-        if [[ "${killConfirm}" == "y" || "${killConfirm}" == "Y" ]]; then
+        if [[ "${killConfirm}" =~ ^[yY]$ ]]; then
             break
-        elif [[ "${killConfirm}" == "n" || "${killConfirm}" == "N" ]]; then
+        elif [[ "${killConfirm}" =~ ^[nN]$ ]]; then
             echo "✅ 用户手动取消操作"
             return 0
         else
diff --git a/shell/device-tools/env/RestartAdb.sh b/shell/device-tools/env/RestartAdb.sh
@@ -19,9 +19,9 @@ restartAdbProcess() {
     echo "确定要重启 adb 进程? （y/n）"
     while true; do
         read -r restartConfirm
-        if [[ "${restartConfirm}" == "y" || "${restartConfirm}" == "Y" ]]; then
+        if [[ "${restartConfirm}" =~ ^[yY]$ ]]; then
             break
-        elif [[ "${restartConfirm}" == "n" || "${restartConfirm}" == "N" ]]; then
+        elif [[ "${restartConfirm}" =~ ^[nN]$ ]]; then
             echo "✅ 用户手动取消操作"
             return 0
         else
diff --git a/shell/device-tools/flash/FlashRecovery.sh b/shell/device-tools/flash/FlashRecovery.sh
@@ -46,10 +46,10 @@ flashRecoveryForDevice() {
     echo "这是一个危险操作，你确定要给设备刷入新的 recovery ？（y/n）"
     read -r flashConfirm
 
-    if [[ "${flashConfirm}" == "n" || "${flashConfirm}" == "N" ]]; then
+    if [[ "${flashConfirm}" =~ ^[nN]$ ]]; then
         echo "✅ 用户手动取消操作"
         return 0
-    elif [[ "${flashConfirm}" != "y" && "${flashConfirm}" != "Y" ]]; then
+    elif [[ ! "${flashConfirm}" =~ ^[yY]$ ]]; then
         echo "❌ 无效选择，已取消操作"
         return 1
     fi
diff --git a/shell/device-tools/flash/FlashTempRecovery.sh b/shell/device-tools/flash/FlashTempRecovery.sh
@@ -94,10 +94,10 @@ flashTempRecoveryForDevice() {
 
     echo "这是一个危险操作，你确定要给设备加载临时的 recovery ？（y/n）"
     read -r loadConfirm
-    if [[ "${loadConfirm}" == "n" || "${loadConfirm}" == "N" ]]; then
+    if [[ "${loadConfirm}" =~ ^[nN]$ ]]; then
         echo "✅ 用户手动取消操作"
         return 0
-    elif [[ "${loadConfirm}" != "y" && "${loadConfirm}" != "Y" ]]; then
+    elif [[ ! "${loadConfirm}" =~ ^[yY]$ ]]; then
         echo "❌ 无效选择，已取消操作"
         return 1
     fi
diff --git a/shell/device-tools/flash/RestartToFastboot.sh b/shell/device-tools/flash/RestartToFastboot.sh
@@ -33,7 +33,7 @@ rebootToFastbootForDevices() {
     deviceId="$(inputMultipleAdbDevice)"
     echo "你确定要将设备重启到 fastboot 模式？（y/n）"
     read -r rebootFastbootConfirm
-    if [[ ${rebootFastbootConfirm} == "y" || ${rebootFastbootConfirm} == "Y" ]]; then
+    if [[ ${rebootFastbootConfirm} =~ ^[yY]$ ]]; then
         if [[ -n "${deviceId}" ]]; then
             rebootToFastboot "${deviceId}"
         else
@@ -43,7 +43,7 @@ rebootToFastbootForDevices() {
             done < <(echo "${adbDeviceIdsString}" | tr -d '\r' | grep -v '^$')
         fi
         exit 0
-    elif [[ ${rebootFastbootConfirm} == "n" || ${rebootFastbootConfirm} == "N" ]]; then
+    elif [[ ${rebootFastbootConfirm} =~ ^[nN]$ ]]; then
         echo "✅ 已取消关机操作"
         exit 0
     else
diff --git a/shell/device-tools/flash/RestartToRecovery.sh b/shell/device-tools/flash/RestartToRecovery.sh
@@ -50,7 +50,7 @@ rebootToRecoveryForDevice() {
     deviceId="$(inputMultipleDevice)"
     echo "你确定要将设备重启到 recovery 模式？（y/n）"
     read -r rebootRecoveryConfirm
-    if [[ ${rebootRecoveryConfirm} == "y" || ${rebootRecoveryConfirm} == "Y" ]]; then
+    if [[ ${rebootRecoveryConfirm} =~ ^[yY]$ ]]; then
         if [[ -n "${deviceId}" ]]; then
             adbDeviceIdsString=$(getAdbDeviceIdsString)
             fastbootDeviceIdsString=$(getFastbootDeviceIdsString)
@@ -69,7 +69,7 @@ rebootToRecoveryForDevice() {
                 rebootToRecoveryByFastboot "${fastbootDeviceId}"
             done < <(echo "${fastbootDeviceIdsString}" | tr -d '\r' | grep -v '^$')
         fi
-    elif [[ ${rebootRecoveryConfirm} == "n" || ${rebootRecoveryConfirm} == "N" ]]; then
+    elif [[ ${rebootRecoveryConfirm} =~ ^[nN]$ ]]; then
         echo "✅ 已取消操作"
     else
         echo "❌ 输入错误，取消操作"
diff --git a/shell/device-tools/hardware/DeviceRestart.sh b/shell/device-tools/hardware/DeviceRestart.sh
@@ -51,7 +51,7 @@ rebootDeviceForDevice() {
     deviceId="$(inputMultipleDevice)"
     echo "你确定要对设备进行重启？（y/n）"
     read -r rebootConfirm
-    if [[ ${rebootConfirm} == "y" || ${rebootConfirm} == "Y" ]]; then
+    if [[ ${rebootConfirm} =~ ^[yY]$ ]]; then
         if [[ -n "${deviceId}" ]]; then
             adbDeviceIdsString=$(getAdbDeviceIdsString)
             fastbootDeviceIdsString=$(getFastbootDeviceIdsString)
@@ -71,7 +71,7 @@ rebootDeviceForDevice() {
             done < <(echo "${fastbootDeviceIdsString}" | tr -d '\r' | grep -v '^$')
         fi
         exit 0
-    elif [[ ${rebootConfirm} == "n" || ${rebootConfirm} == "N" ]]; then
+    elif [[ ${rebootConfirm} =~ ^[nN]$ ]]; then
         echo "✅ 已取消重启操作"
         exit 0
     else
diff --git a/shell/device-tools/hardware/PowerOffDevice.sh b/shell/device-tools/hardware/PowerOffDevice.sh
@@ -52,7 +52,7 @@ powerOffDeviceForDevice() {
 
     echo "你确定要对设备进行关机？（y/n）"
     read -r powerOffConfirm
-    if [[ ${powerOffConfirm} == "y" || ${powerOffConfirm} == "Y" ]]; then
+    if [[ ${powerOffConfirm} =~ ^[yY]$ ]]; then
         adbDeviceIdsString=$(getAdbDeviceIdsString)
         fastbootDeviceIdsString=$(getFastbootDeviceIdsString)
         if [[ -n "${deviceId}" ]]; then
@@ -71,7 +71,7 @@ powerOffDeviceForDevice() {
             done < <(echo "${fastbootDeviceIdsString}" | tr -d '\r' | grep -v '^$')
         fi
         exit 0
-    elif [[ ${powerOffConfirm} == "n" || ${powerOffConfirm} == "N" ]]; then
+    elif [[ ${powerOffConfirm} =~ ^[nN]$ ]]; then
         echo "✅ 已取消关机操作"
         exit 0
     else
diff --git a/shell/device-tools/simulation/InputText.sh b/shell/device-tools/simulation/InputText.sh
@@ -446,14 +446,14 @@ checkInstallAdbKeyBoard() {
         echo "🤔 检测到 [${adbDeviceId}] 设备 ADBKeyBoard 还未安装，请问是否安装？（y/n）"
         while true; do
             read -r installConfirm
-            if [[ "${installConfirm}" == "y" || "${installConfirm}" == "Y" ]]; then
+            if [[ "${installConfirm}" =~ ^[yY]$ ]]; then
                 installAdbKeyBoard "${adbDeviceId}"
                 local exitCode=$?
                 if (( exitCode != 0 )); then
                     exit ${exitCode}
                 fi
                 break
-            elif [[ "${installConfirm}" == "n" || "${installConfirm}" == "N" ]]; then
+            elif [[ "${installConfirm}" =~ ^[nN]$ ]]; then
                 echo "✅ 用户手动取消安装"
                 exit 0
             else
@@ -499,7 +499,7 @@ inputTextForDevice() {
 
     while true; do
         read -r focusConfirm
-        if [[ "${focusConfirm}" == "y" || "${focusConfirm}" == "Y" ]]; then
+        if [[ "${focusConfirm}" =~ ^[yY]$ ]]; then
             local pids=()
             for adbDeviceId in "${adbDeviceList[@]}"; do
                 inputTextSingleDevice "${adbDeviceId}" "${inputText}" "${needAdbKeyboard}" &
@@ -515,7 +515,7 @@ inputTextForDevice() {
                 echo "✅ 当前设备的文本输入任务已完成"
             fi
             break
-        elif [[ "${focusConfirm}" == "n" || "${focusConfirm}" == "N" ]]; then
+        elif [[ "${focusConfirm}" =~ ^[nN]$ ]]; then
             disabledAdbKeyBoard
             echo "✅ 用户选择不获取焦点，无法进行下一步，取消操作"
             break
diff --git a/shell/git-tools/CloneRepository.sh b/shell/git-tools/CloneRepository.sh
@@ -101,11 +101,11 @@ waitUserInputParameter() {
         echo "👻 目标目录已存在且非空，是否覆盖？（y/n）"
         while true; do
             read -r overwriteConfirm
-            if [[ "${overwriteConfirm}" == "y" || "${overwriteConfirm}" == "Y" ]]; then
+            if [[ "${overwriteConfirm}" =~ ^[yY]$ ]]; then
                 echo "🧹 正在清理原目录以覆盖..."
                 rm -rf "${targetDirPath}"
                 break
-            elif [[ "${overwriteConfirm}" == "n" || "${overwriteConfirm}" == "N" ]]; then
+            elif [[ "${overwriteConfirm}" =~ ^[nN]$ ]]; then
                 baseDirPath=$(dirname "${targetDirPath}")
                 suffix=2
                 newDirPath="${baseDirPath}$(getFileSeparator)${repositoryName} (${suffix})"
@@ -162,10 +162,10 @@ loopCloneRepository() {
         echo "👻 已重试 ${maxRetryCount} 次仍失败，是否继续重试？（y/n）"
         while true; do
             read -r retryConfirm
-            if [[ "${retryConfirm}" == "y" || "${retryConfirm}" == "Y" ]]; then
+            if [[ "${retryConfirm}" =~ ^[yY]$ ]]; then
                 currentRetryCount=1
                 break
-            elif [[ "${retryConfirm}" == "n" || "${retryConfirm}" == "N" ]]; then
+            elif [[ "${retryConfirm}" =~ ^[nN]$ ]]; then
                 echo "✅ 用户手动取消重试"
                 exit 0
             else
diff --git a/shell/git-tools/commit/amend/RewriteUserCommitHistory.sh b/shell/git-tools/commit/amend/RewriteUserCommitHistory.sh
@@ -130,10 +130,10 @@ main() {
     echo "新用户名：${newName} 新邮箱：${newEmail}"
     echo "🤔 共有 ${matchCount} 个提交的作者或提交者信息将被改写为：${newName} <${newEmail}>，请问是否继续？（y/n）"
     read -r rewriteConfirm
-    if [[ "${rewriteConfirm}" == "n" || "${rewriteConfirm}" == "N" ]]; then
+    if [[ "${rewriteConfirm}" =~ ^[nN]$ ]]; then
         echo "✅ 用户手动取消操作"
         exit 0
-    elif [[ "${rewriteConfirm}" != "y" && "${rewriteConfirm}" != "Y" ]]; then
+    elif [[ ! "${rewriteConfirm}" =~ ^[yY]$ ]]; then
         echo "❌ 无效选择，已取消操作"
         exit 1
     fi
diff --git a/shell/git-tools/commit/revert/RevertCommit.sh b/shell/git-tools/commit/revert/RevertCommit.sh
@@ -126,7 +126,7 @@ main() {
 
     echo "👻 该操作将撤销指定提交，可能影响历史并引发冲突，是否继续？(y/n)"
     read -r proceedDanger
-    if [[ "${proceedDanger}" != "y" && "${proceedDanger}" != "Y" ]]; then
+    if [[ ! "${proceedDanger}" =~ ^[yY]$ ]]; then
         echo "已取消撤销操作"
         exit 1
     fi
diff --git a/shell/git-tools/config/SetOptimalConfig.sh b/shell/git-tools/config/SetOptimalConfig.sh
@@ -56,15 +56,15 @@ waitUserInputParameter() {
     fi
     while true; do
         read -r configConfirm
-        if [[ "${configConfirm}" == "y" || "${configConfirm}" == "Y" ]]; then
+        if [[ "${configConfirm}" =~ ^[yY]$ ]]; then
             setOptimalConfig
             if [[ -n "${repositoryDirPath}" ]]; then
                 echo "✅ 仓库 Git 最佳配置完成"
             else
                 echo "✅ 全局 Git 最佳配置完成"
             fi
             break
-        elif [[ "${configConfirm}" == "n" || "${configConfirm}" == "N" ]]; then
+        elif [[ "${configConfirm}" =~ ^[nN]$ ]]; then
             echo "✅ 用户手动取消操作"
             break
         else
diff --git a/shell/git-tools/push/ForcePushBranch.sh b/shell/git-tools/push/ForcePushBranch.sh
@@ -82,10 +82,10 @@ forcePushBranch() {
 
     echo "👻 强制推送分支会强制覆盖远端分支的提交，你确定要继续吗？（y/n）"
     read -r forcePushBranchConfirm
-    if [[ "${forcePushBranchConfirm}" == "n" || "${forcePushBranchConfirm}" == "N" ]]; then
+    if [[ "${forcePushBranchConfirm}" =~ ^[nN]$ ]]; then
         echo "✅ 用户手动取消强制推送分支"
         exit 0
-    elif [[ "${forcePushBranchConfirm}" != "y" && "${forcePushBranchConfirm}" != "Y" ]]; then
+    elif [[ ! "${forcePushBranchConfirm}" =~ ^[yY]$ ]]; then
         echo "❌ 无效选择，已取消操作"
         exit 0
     fi
@@ -101,11 +101,11 @@ forcePushBranch() {
     echo "👻 强制推送失败，是否进行重试？（y/n）"
     while true; do
         read -r retryConfirm
-        if [[ ${retryConfirm} == "n" || ${retryConfirm} == "N" ]]; then
+        if [[ ${retryConfirm} =~ ^[nN]$ ]]; then
             (cd "${repositoryDirPath}" && git branch -D "${backupBranch}" < /dev/null > /dev/null 2>&1)
             echo "✅ 已放弃强制推送分支，已删除本地备份分支 ${backupBranch}"
             exit "${exitCode}"
-        elif [[ ${retryConfirm} != "y" && ${retryConfirm} != "Y" ]]; then
+        elif [[ ! ${retryConfirm} =~ ^[yY]$ ]]; then
             echo "👻 输入不正确，请输入正确的选项（y/n）"
             continue
         fi
diff --git a/shell/git-tools/push/ForcePushTags.sh b/shell/git-tools/push/ForcePushTags.sh
@@ -32,16 +32,16 @@ forcePushTags() {
     echo "👻 是否用本地标签覆盖远端对应的标签？（y/n）"
     while true; do
         read -r rewriteTagConfirm
-        if [[ "${rewriteTagConfirm}" == "y" || "${rewriteTagConfirm}" == "Y" ]]; then
+        if [[ "${rewriteTagConfirm}" =~ ^[yY]$ ]]; then
             echo "👻 该操作会覆盖远端的标签，这是一个危险的操作，你确定要继续吗？（y/n）"
             read -r forcePushBranchConfirm
-            if [[ ${forcePushBranchConfirm} != "y" && ${forcePushBranchConfirm} != "Y" ]]; then
+            if [[ ! ${forcePushBranchConfirm} =~ ^[yY]$ ]]; then
                 echo "✅ 已放弃强制推送标签"
                 exit 0
             fi
             echo "💊 该操作一旦完成将不可逆，并且没有任何形式的备份（没有后悔药），你确定要继续吗？（y/n）"
             read -r forcePushBranchConfirm
-            if [[ ${forcePushBranchConfirm} != "y" && ${forcePushBranchConfirm} != "Y" ]]; then
+            if [[ ! ${forcePushBranchConfirm} =~ ^[yY]$ ]]; then
                 echo "✅ 已放弃强制推送标签"
                 exit 0
             fi
@@ -61,7 +61,7 @@ forcePushTags() {
                 echo "❌ 推送标签失败，错误码：${exitCode}"
                 exit "${exitCode}"
             fi
-        elif [[ "${rewriteTagConfirm}" == "n" || "${rewriteTagConfirm}" == "N" ]]; then
+        elif [[ "${rewriteTagConfirm}" =~ ^[nN]$ ]]; then
             echo "✅ 已跳过标签推送"
             exit 0
         else
diff --git a/shell/package-tools/SignatureApk.sh b/shell/package-tools/SignatureApk.sh
diff --git a/shell/ssh-key-tools/CreateSshKey.sh b/shell/ssh-key-tools/CreateSshKey.sh
diff --git a/shell/ssh-key-tools/DeleteSshKey.sh b/shell/ssh-key-tools/DeleteSshKey.sh
diff --git a/shell/ssh-key-tools/QuerySshPublicKey.sh b/shell/ssh-key-tools/QuerySshPublicKey.sh
