diff --git a/shadowsocks-all-mihomo.sh b/shadowsocks-all-mihomo.sh index 3c4a0e7..bde7d8d 100644 --- a/shadowsocks-all-mihomo.sh +++ b/shadowsocks-all-mihomo.sh @@ -228,22 +228,12 @@ install_select(){ install_prepare_password(){ if is_2022_cipher "${shadowsockscipher}"; then - local key_size default_key + local key_size key_size=$(get_2022_key_size "${shadowsockscipher}") - default_key=$(generate_2022_key "${key_size}") - while true - do - echo "Please enter base64 key for ${shadowsockscipher}" - read -r -p "(Default key: ${default_key}):" shadowsockspwd - [ -z "${shadowsockspwd}" ] && shadowsockspwd="${default_key}" - if is_valid_2022_key "${shadowsockspwd}" "${key_size}"; then - echo - echo "password = ${shadowsockspwd}" - echo - break - fi - echo -e "[${red}Error${plain}] ${shadowsockscipher} requires a base64 key decoded to ${key_size} bytes" - done + shadowsockspwd=$(generate_2022_key "${key_size}") + echo + echo "password = ${shadowsockspwd}" + echo return 0 fi