diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh index 19c2285..e1457b6 100644 --- a/shadowsocks-all.sh +++ b/shadowsocks-all.sh @@ -592,17 +592,14 @@ install_prepare_port() { [ -z "${shadowsocksport}" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "port = ${shadowsocksport}" echo break - else - echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" fi - else - echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done } @@ -620,11 +617,11 @@ install_prepare_cipher() { [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#common_ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#common_ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#common_ciphers[@]}" continue fi shadowsockscipher=${common_ciphers[$pick-1]} @@ -637,11 +634,11 @@ install_prepare_cipher() { [ -z "$pick" ] && pick=2 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#r_ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#r_ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#r_ciphers[@]}" continue fi shadowsockscipher=${r_ciphers[$pick-1]} @@ -654,11 +651,11 @@ install_prepare_cipher() { [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#go_ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#go_ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#go_ciphers[@]}" continue fi shadowsockscipher=${go_ciphers[$pick-1]} @@ -683,11 +680,11 @@ install_prepare_protocol() { [ -z "$protocol" ] && protocol=1 expr ${protocol} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$protocol" -lt 1 || "$protocol" -gt ${#protocols[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#protocols[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#protocols[@]}" continue fi shadowsockprotocol=${protocols[$protocol-1]} @@ -710,11 +707,11 @@ install_prepare_obfs() { [ -z "$r_obfs" ] && r_obfs=1 expr ${r_obfs} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$r_obfs" -lt 1 || "$r_obfs" -gt ${#obfs[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#obfs[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#obfs[@]}" continue fi shadowsockobfs=${obfs[$r_obfs-1]} @@ -757,11 +754,11 @@ install_prepare_libev_obfs() { [ -z "$r_libev_obfs" ] && r_libev_obfs=1 expr ${r_libev_obfs} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$r_libev_obfs" -lt 1 || "$r_libev_obfs" -gt ${#obfs_libev[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#obfs_libev[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#obfs_libev[@]}" continue fi shadowsocklibev_obfs=${obfs_libev[$r_libev_obfs-1]} diff --git a/shadowsocks-go.sh b/shadowsocks-go.sh index 5058e2b..5e46207 100644 --- a/shadowsocks-go.sh +++ b/shadowsocks-go.sh @@ -155,7 +155,7 @@ pre_install(){ exit 1 fi # Set shadowsocks-go config password - echo "Please input password for shadowsocks-go:" + echo "Please enter password for shadowsocks-go:" read -p "(Default password: teddysun.com):" shadowsockspwd [ -z "${shadowsockspwd}" ] && shadowsockspwd="teddysun.com" echo @@ -166,24 +166,21 @@ pre_install(){ # Set shadowsocks-go config port while true do - echo -e "Please input port for shadowsocks-go [1-65535]:" + echo -e "Please enter a port for shadowsocks-go [1-65535]:" read -p "(Default port: 8989):" shadowsocksport [ -z "${shadowsocksport}" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "---------------------------" echo "port = ${shadowsocksport}" echo "---------------------------" echo break - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done # Set shadowsocks config stream ciphers @@ -198,11 +195,11 @@ pre_install(){ [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#ciphers[@]}" continue fi shadowsockscipher=${ciphers[$pick-1]} diff --git a/shadowsocks-libev-debian.sh b/shadowsocks-libev-debian.sh index 5aa0f63..7ee5207 100644 --- a/shadowsocks-libev-debian.sh +++ b/shadowsocks-libev-debian.sh @@ -234,24 +234,21 @@ pre_install(){ # Set shadowsocks-libev config port while true do - echo -e "Please input port for shadowsocks-libev [1-65535]:" + echo -e "Please enter a port for shadowsocks-libev [1-65535]:" read -p "(Default port: 8989):" shadowsocksport [ -z "$shadowsocksport" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "---------------------------" echo "port = ${shadowsocksport}" echo "---------------------------" echo break - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done # Set shadowsocks config stream ciphers @@ -266,11 +263,11 @@ pre_install(){ [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#ciphers[@]}" continue fi shadowsockscipher=${ciphers[$pick-1]} diff --git a/shadowsocks-libev.sh b/shadowsocks-libev.sh index d34b11d..7b221b5 100644 --- a/shadowsocks-libev.sh +++ b/shadowsocks-libev.sh @@ -250,7 +250,7 @@ pre_install(){ fi # Set shadowsocks-libev config password - echo "Please input password for shadowsocks-libev:" + echo "Please enter password for shadowsocks-libev:" read -p "(Default password: teddysun.com):" shadowsockspwd [ -z "${shadowsockspwd}" ] && shadowsockspwd="teddysun.com" echo @@ -262,24 +262,21 @@ pre_install(){ # Set shadowsocks-libev config port while true do - echo -e "Please input port for shadowsocks-libev [1-65535]:" + echo -e "Please enter a port for shadowsocks-libev [1-65535]:" read -p "(Default port: 8989):" shadowsocksport [ -z "$shadowsocksport" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "---------------------------" echo "port = ${shadowsocksport}" echo "---------------------------" echo break - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done # Set shadowsocks config stream ciphers @@ -294,11 +291,11 @@ pre_install(){ [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#ciphers[@]}" continue fi shadowsockscipher=${ciphers[$pick-1]} diff --git a/shadowsocks.sh b/shadowsocks.sh index fd5e26d..6759bfe 100644 --- a/shadowsocks.sh +++ b/shadowsocks.sh @@ -162,7 +162,7 @@ pre_install(){ exit 1 fi # Set shadowsocks config password - echo "Please input password for shadowsocks-python" + echo "Please enter password for shadowsocks-python" read -p "(Default password: teddysun.com):" shadowsockspwd [ -z "${shadowsockspwd}" ] && shadowsockspwd="teddysun.com" echo @@ -173,24 +173,21 @@ pre_install(){ # Set shadowsocks config port while true do - echo "Please input port for shadowsocks-python [1-65535]" + echo "Please enter a port for shadowsocks-python [1-65535]" read -p "(Default port: 8989):" shadowsocksport [ -z "$shadowsocksport" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "---------------------------" echo "port = ${shadowsocksport}" echo "---------------------------" echo break - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done # Set shadowsocks config stream ciphers @@ -205,11 +202,11 @@ pre_install(){ [ -z "$pick" ] && pick=1 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#ciphers[@]}" continue fi shadowsockscipher=${ciphers[$pick-1]} diff --git a/shadowsocksR.sh b/shadowsocksR.sh index 73768e8..bba5e1b 100644 --- a/shadowsocksR.sh +++ b/shadowsocksR.sh @@ -186,7 +186,7 @@ pre_install(){ exit 1 fi # Set ShadowsocksR config password - echo "Please input password for ShadowsocksR:" + echo "Please enter password for ShadowsocksR:" read -p "(Default password: teddysun.com):" shadowsockspwd [ -z "${shadowsockspwd}" ] && shadowsockspwd="teddysun.com" echo @@ -197,24 +197,21 @@ pre_install(){ # Set ShadowsocksR config port while true do - echo -e "Please input port for ShadowsocksR [1-65535]:" + echo -e "Please enter a port for ShadowsocksR [1-65535]:" read -p "(Default port: 8989):" shadowsocksport [ -z "${shadowsocksport}" ] && shadowsocksport="8989" expr ${shadowsocksport} + 1 &>/dev/null if [ $? -eq 0 ]; then - if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ]; then + if [ ${shadowsocksport} -ge 1 ] && [ ${shadowsocksport} -le 65535 ] && [ ${shadowsocksport:0:1} != 0 ]; then echo echo "---------------------------" echo "port = ${shadowsocksport}" echo "---------------------------" echo break - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi - else - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and 65535" fi + echo -e "[${red}Error${plain}] Please enter a correct number [1-65535]" done # Set shadowsocksR config stream ciphers @@ -229,11 +226,11 @@ pre_install(){ [ -z "$pick" ] && pick=2 expr ${pick} + 1 &>/dev/null if [ $? -ne 0 ]; then - echo -e "[${red}Error${plain}] Input error, please input a number" + echo -e "[${red}Error${plain}] Please enter a number" continue fi if [[ "$pick" -lt 1 || "$pick" -gt ${#ciphers[@]} ]]; then - echo -e "[${red}Error${plain}] Input error, please input a number between 1 and ${#ciphers[@]}" + echo -e "[${red}Error${plain}] Please enter a number between 1 and ${#ciphers[@]}" continue fi shadowsockscipher=${ciphers[$pick-1]}