Merge pull request #127 from enoch85/patch-1

Address comment
This commit is contained in:
RustDesk 2023-10-07 18:16:32 +08:00 committed by GitHub
commit 88d6186186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -79,25 +79,25 @@ fi
choice=$(whiptail --title "$TITLE" --checklist \ choice=$(whiptail --title "$TITLE" --checklist \
"Please choose what to uninstall:\n\n "Please choose what to uninstall:\n\n
$CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \ $CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
"Certbot" "(Everything related to Let's Encrypt)" "$CERTBOT_SWITCH" \ "certbot" "(Everything related to Let's Encrypt)" "$CERTBOT_SWITCH" \
"RustDesk-LOGs" "(RustDesk log dir)" ON \ "rustdesk-logs" "(RustDesk LOG dir)" ON \
"RustDesk-SERVER" "(RustDesk server + RustDesk services)" ON \ "rustdesk-server" "(RustDesk SERVER + RustDesk services)" ON \
"NGINX-RustDesk" "(RustDesk Nginx config)" OFF \ "nginx-rustdesk" "(RustDesk Nginx config)" OFF \
"NGINX" "(Linux package + ALL configs)" ON \ "nginx" "(Linux webserver package + ALL configs)" ON \
"UFW" "(Linux package + RustDesk rules)" ON \ "ufw" "(Linux firewall package + RustDesk rules)" ON \
"whiptail" "(Linux menu package)" ON \
"curl" "(Linux package)" OFF \ "curl" "(Linux package)" OFF \
"wget" "(Linux package)" ON \ "wget" "(Linux package)" OFF \
"unzip" "(Linux package)" ON \ "unzip" "(Linux package)" OFF \
"whiptail" "(Linux package)" ON \
"dnsutils" "(Linux package)" ON \ "dnsutils" "(Linux package)" ON \
"bind-utils" "(Linux package)" ON \ "bind-utils" "(Linux package)" ON \
"bind" "(Linux package)" ON 3>&1 1>&2 2>&3) "bind" "(Linux package)" ON 3>&1 1>&2 2>&3)
case "$choice" in case "$choice" in
*"NGINX-RustDesk"*) *"nginx-rustdesk"*)
REMOVE_NGINX_CONF="yes" REMOVE_NGINX_CONF="yes"
;;& ;;&
*"NGINX"*) *"nginx"*)
REMOVE_NGINX_ALL="yes" REMOVE_NGINX_ALL="yes"
;;& ;;&
*"wget"*) *"wget"*)
@ -118,19 +118,19 @@ case "$choice" in
*"bind"*) *"bind"*)
REMOVE_BIND="yes" REMOVE_BIND="yes"
;;& ;;&
*"UFW"*) *"ufw"*)
REMOVE_UFW="yes" REMOVE_UFW="yes"
;;& ;;&
*"RustDesk-LOGs"*) *"rustdesk-logs"*)
REMOVE_RUSTDESK_LOG="yes" REMOVE_RUSTDESK_LOG="yes"
;;& ;;&
*"RustDesk-SERVER"*) *"rustdesk-server"*)
REMOVE_RUSTDESK_SERVER="yes" REMOVE_RUSTDESK_SERVER="yes"
;;& ;;&
*"curl"*) *"curl"*)
REMOVE_CURL="yes" REMOVE_CURL="yes"
;;& ;;&
*"Certbot"*) *"certbot"*)
REMOVE_CERTBOT="yes" REMOVE_CERTBOT="yes"
;;& ;;&
*) *)