From 0a88ca51c2072537abcdbced263f7af4c03c955e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Fri, 19 Apr 2024 11:54:14 -0400 Subject: [PATCH] Disable spinner while selecting options; Silence wget command --- ct/calibre-web.sh | 5 ++++- install/calibre-web-install.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ct/calibre-web.sh b/ct/calibre-web.sh index c3b20ef0..99b5fead 100644 --- a/ct/calibre-web.sh +++ b/ct/calibre-web.sh @@ -102,7 +102,10 @@ function update_script() { menu_array[$array_index]=ON done fi - CHOICES=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CALIBRE-WEB OPTIONS" --separate-output --checklist "Choose Additional Options" 15 125 8 "${array[@]}" 3>&1 1>&2 2>&3) + if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi + CHOICES=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CALIBRE-WEB OPTIONS" --separate-output --checklist "Choose Additional Options" 15 125 8 "${menu_array[@]}" 3>&1 1>&2 2>&3) + spinner & + SPINNER_PID=$! if [ ! -z "$CHOICES" ]; then declare -a options for CHOICE in $CHOICES; do diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh index afd8a77b..7f38e044 100644 --- a/install/calibre-web-install.sh +++ b/install/calibre-web-install.sh @@ -27,7 +27,7 @@ cd /opt/kepubify curl -fsSLO https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-linux-64bit &>/dev/null chmod +x kepubify-linux-64bit mkdir -p /opt/calibre-web -wget https://github.com/janeczku/calibre-web/raw/master/library/metadata.db -P /opt/calibre-web +$STD wget https://github.com/janeczku/calibre-web/raw/master/library/metadata.db -P /opt/calibre-web $STD pip install calibreweb msg_ok "Installed calibre-web" @@ -58,6 +58,6 @@ $STD apt-get autoremove $STD apt-get autoclean msg_ok "Cleaned" -echo -e "Default login for ${APP}: +echo -e "Default login for Calibre-web: user: ${BL}admin${CL} \n password: ${BL}admin123${CL} \n" \ No newline at end of file