From 0f80b05bbf5dd56c0e392351df0b07868e7ebaa2 Mon Sep 17 00:00:00 2001 From: tavo Date: Thu, 16 May 2024 14:46:57 -0600 Subject: [PATCH] fix read --- 04-main.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/04-main.sh b/04-main.sh index 7b06710..f76631c 100644 --- a/04-main.sh +++ b/04-main.sh @@ -68,11 +68,13 @@ if [ "$MENU" = "zenity" ] ; then zenity --title "$TITLE" --text "$PROMPT_END_SUCCESS" --info elif [ "$MENU" = "term" ] ; then - term_prompt info "$PROMPT_WELCOME" && read -r NULL + term_prompt info "$PROMPT_WELCOME" + read -r NULL ! command -v curl >/dev/null 2>&1 && term_prompt error "$PROMPT_ERR_DEPS curl" && exit 1 # Serial number is required for download - term_prompt entry "$PROMPT_SERIAL" && read -r SERIAL + term_prompt entry "$PROMPT_SERIAL" + read -r SERIAL [ -z "$SERIAL" ] && term_prompt error "$PROMPT_ERR_SERIAL" && exit 1 echo_debug "Generar tempkey y obtener URL de descarga" # DEBUG @@ -91,7 +93,8 @@ elif [ "$MENU" = "term" ] ; then curl "$DOWNLOAD_URL" -o "$SAVE_FILE" --progress-bar echo_debug "Consultar sudo pass" # DEBUG - term_prompt entry "$PROMPT_SUDO_PASSWORD" && IFS= read -r SUDO_PASSWORD + term_prompt entry "$PROMPT_SUDO_PASSWORD" + IFS= read -r SUDO_PASSWORD [ -z "$SUDO_PASSWORD" ] && term_prompt error "$PROMPT_ERR_DEPS_INSTALL" && exit 1 CORRECT_SUDO_PASSWORD="$(tsudo whoami >/dev/null 2>&1 || printf 'no')" [ "$CORRECT_SUDO_PASSWORD" = "no" ] && term_prompt error "$PROMPT_ERR_DEPS_INSTALL" && exit 1