gsadmin/pulse
1
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-09-10 18:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve install script logic and flow

Browse Source
This commit is contained in:
courtmanr@gmail.com
2025-05-01 14:25:54 +01:00
parent 144a9128f5
commit 6be48b65d8
1 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install-pulse.sh
+33 -58
View File
@@ -69,7 +69,7 @@ print_warning() {
}
print_error() {
echo -e "\033[1;31m[ERROR]\033[0m $1 >&2
echo -e "\033[1;31m[ERROR]\033[0m $1" >&2
}
check_root() {
@@ -99,9 +99,7 @@ self_update_check() {
# Compare the downloaded script with the running script
if ! diff -q "$SCRIPT_ABS_PATH" "$temp_script" >/dev/null 2>&1; then
print_warning "A newer version of the installation script is available."
# Use separate echo and read for better compatibility
echo -n "Do you want to update the installer and re-run? (Y/n): "
read update_confirm
read -p "Do you want to update the installer and re-run? (Y/n): " update_confirm
if [[ ! "$update_confirm" =~ ^[Nn]$ ]]; then # Default Yes
print_info "Updating installer script..."
# Make the new script executable
@@ -278,72 +276,49 @@ check_installation_status_and_determine_action() {
# If user specified a version different from current, offer update
if [ -n "$SPECIFIED_VERSION_TAG" ] && [ "$SPECIFIED_VERSION_TAG" != "$current_tag" ]; then
print_info "You requested version $SPECIFIED_VERSION_TAG, but $current_tag is installed."
printf '%s\\n' "Choose an action:"
# Reordered options
printf ' %s) %s\\n' "1" "Manage automatic updates"
printf ' %s) %s %s\\n' "2" "Install specified version" "$SPECIFIED_VERSION_TAG"
printf ' %s) %s\\n' "3" "Remove Pulse"
printf ' %s) %s\\n' "4" "Cancel"
read -p "Enter your choice [1-4]: " user_choice # Updated range
echo "Choose an action:"
echo " 1) Install specified version ($SPECIFIED_VERSION_TAG)"
echo " 2) Remove Pulse"
echo " 3) Cancel"
read -p "Enter your choice (1-3): " user_choice
case $user_choice in
# Adjusted case logic
1) prompt_for_cron_setup; INSTALL_MODE="cancel" ;; # Call cron setup and then cancel main flow
2) INSTALL_MODE="update" ;; # Treat re-run as update
3) INSTALL_MODE="remove" ;;
4) INSTALL_MODE="cancel" ;;
1) INSTALL_MODE="update" ;; # Treat re-run as update
2) INSTALL_MODE="remove" ;;
3) INSTALL_MODE="cancel" ;;
*) print_error "Invalid choice."; INSTALL_MODE="error" ;;
esac
else # Up to date and no specific version requested OR specified matches current
printf '%s\\n' "Choose an action:"
# Reordered options
printf ' %s) %s\\n' "1" "Manage automatic updates"
printf ' %s) %s %s\\n' "2" "Re-install current version" "$current_tag"
printf ' %s) %s\\n' "3" "Remove Pulse"
printf ' %s) %s\\n' "4" "Cancel"
read -p "Enter your choice [1-4]: " user_choice # Updated range
echo "Choose an action:"
echo " 1) Re-install current version ($current_tag)" # Changed prompt
echo " 2) Remove Pulse"
echo " 3) Cancel"
read -p "Enter your choice (1-3): " user_choice
case $user_choice in
# Adjusted case logic
1) prompt_for_cron_setup; INSTALL_MODE="cancel" ;; # Call cron setup and then cancel main flow
2) INSTALL_MODE="update" ;; # Treat re-run as update
3) INSTALL_MODE="remove" ;;
4) INSTALL_MODE="cancel" ;;
1) INSTALL_MODE="update" ;; # Treat re-run as update
2) INSTALL_MODE="remove" ;;
3) INSTALL_MODE="cancel" ;;
*) print_error "Invalid choice."; INSTALL_MODE="error" ;;
esac
fi
elif [ "$INSTALL_MODE" = "update" ]; then # Update available or fetch failed
if [ -n "$SPECIFIED_VERSION_TAG" ]; then
printf '%s\\n' "Choose an action:"
# Reordered options
printf ' %s) %s\\n' "1" "Manage automatic updates"
printf ' %s) %s %s\\n' "2" "Install specified version" "$SPECIFIED_VERSION_TAG"
printf ' %s) %s\\n' "3" "Remove Pulse"
printf ' %s) %s\\n' "4" "Cancel"
read -p "Enter your choice [1-4]: " user_choice # Updated range
case $user_choice in
# Adjusted case logic
1) prompt_for_cron_setup; INSTALL_MODE="cancel" ;; # Call cron setup and then cancel main flow
2) INSTALL_MODE="update" ;;
3) INSTALL_MODE="remove" ;;
4) INSTALL_MODE="cancel" ;;
*) print_error "Invalid choice."; INSTALL_MODE="error" ;;
esac
echo "Choose an action:"
echo " 1) Install specified version ($SPECIFIED_VERSION_TAG)"
echo " 2) Remove Pulse"
echo " 3) Cancel"
else # Defaulting to latest tag
printf '%s\\n' "Choose an action:"
# Reordered options
printf ' %s) %s\\n' "1" "Manage automatic updates"
printf ' %s) %s %s\\n' "2" "Update Pulse to the latest version" "$TARGET_TAG"
printf ' %s) %s\\n' "3" "Remove Pulse"
printf ' %s) %s\\n' "4" "Cancel"
read -p "Enter your choice [1-4]: " user_choice # Updated range
case $user_choice in
# Adjusted case logic
1) prompt_for_cron_setup; INSTALL_MODE="cancel" ;; # Call cron setup and then cancel main flow
2) INSTALL_MODE="update" ;;
3) INSTALL_MODE="remove" ;;
4) INSTALL_MODE="cancel" ;;
*) print_error "Invalid choice."; INSTALL_MODE="error" ;;
esac
echo "Choose an action:"
echo " 1) Update Pulse to the latest version ($TARGET_TAG)"
echo " 2) Remove Pulse"
echo " 3) Cancel"
fi
read -p "Enter your choice (1-3): " user_choice
case $user_choice in
1) INSTALL_MODE="update" ;;
2) INSTALL_MODE="remove" ;;
3) INSTALL_MODE="cancel" ;;
*) print_error "Invalid choice."; INSTALL_MODE="error" ;;
esac
fi
else