alvinlollo/Single-install-script
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Fix remote script dump, add whiptail bash-not-fish warning

Browse Source
This commit is contained in:
alvinlollo
2026-09-23 22:57:40 +10:00
parent bd83ffd2b9
commit 9049b0fc4b
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2
View File
@@ -15,6 +15,8 @@ Please consider staring this project. It helps me see how important this is for
## Usage ## Usage
> **Warning:** Run this script with **bash**, not fish (or another shell). It uses bash-only syntax and will fail if run under fish. Keep `bash` in the commands below — do not replace it with `fish` or `source` the script. If fish is your default shell, a warning (dialog if whiptail is installed, otherwise a text prompt) will remind you before anything is installed.
To use this script paste the following in the Terminal: To use this script paste the following in the Terminal:
```bash ```bash
install.sh
+16 -8
View File
@@ -6,13 +6,21 @@ if [ "$1" = "--skip-watermark" ]; then
skip_watermark=true skip_watermark=true
fi fi
# Detect fish shell and ask user to switch to bash (bash-only syntax) # Detect fish shell and warn user to run with bash instead (bash-only syntax)
if [ -n "${FISH_VERSION:-}" ] || case "$SHELL" in *fish*) ;; *) false ;; esac then if [ -n "${FISH_VERSION:-}" ] || case "$SHELL" in *fish*) ;; *) false ;; esac; then
if command -v whiptail >/dev/null; then
if ! whiptail --title "Warning: use bash, not fish" --yesno \
"Your default shell appears to be fish.\n\nThis script must be run with bash. It uses bash-only syntax and will fail under fish.\n\nRun it with:\n bash install.sh\n\nContinue anyway?" 15 72; then
echo "Aborted. Please run this script with bash, not fish. e.g.: bash install.sh"
exit 1
fi
else
echo "Warning: fish shell detected." echo "Warning: fish shell detected."
echo "This script is written for bash and may have syntax issues under fish." echo "This script must be run with bash, not fish (bash-only syntax)."
echo "Please switch to bash first and re-run it, e.g.: bash $0" echo "Please run it with bash, e.g.: bash install.sh"
read -r -p "Press Enter to continue anyway, or Ctrl+C to cancel..." </dev/tty || true read -r -p "Press Enter to continue anyway, or Ctrl+C to cancel..." </dev/tty || true
fi fi
fi
if [ "$skip_watermark" = false ]; then if [ "$skip_watermark" = false ]; then
clear clear
@@ -133,7 +141,7 @@ else
fi fi
# Fail on any command. # Fail on any command.
set -eu pipefail set -euo pipefail
# Process selected options # Process selected options
for selection in $CHOICE; do for selection in $CHOICE; do
@@ -146,7 +154,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash zsh.sh --skip-watermark bash zsh.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh | bash -s -- --skip-watermark
fi fi
;; ;;
"2") "2")
@@ -156,7 +164,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash fish.sh --skip-watermark bash fish.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/fish.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/fish.sh | bash -s -- --skip-watermark
fi fi
;; ;;
"3") "3")
@@ -261,7 +269,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash bat.sh --skip-watermark bash bat.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/bat.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/bat.sh | bash -s -- --skip-watermark
fi fi
;; ;;
installbeta.sh
+16 -8
View File
@@ -6,13 +6,21 @@ if [ "$1" = "--skip-watermark" ]; then
skip_watermark=true skip_watermark=true
fi fi
# Detect fish shell and ask user to switch to bash (bash-only syntax) # Detect fish shell and warn user to run with bash instead (bash-only syntax)
if [ -n "${FISH_VERSION:-}" ] || case "$SHELL" in *fish*) ;; *) false ;; esac then if [ -n "${FISH_VERSION:-}" ] || case "$SHELL" in *fish*) ;; *) false ;; esac; then
if command -v whiptail >/dev/null; then
if ! whiptail --title "Warning: use bash, not fish" --yesno \
"Your default shell appears to be fish.\n\nThis script must be run with bash. It uses bash-only syntax and will fail under fish.\n\nRun it with:\n bash installbeta.sh\n\nContinue anyway?" 15 72; then
echo "Aborted. Please run this script with bash, not fish. e.g.: bash installbeta.sh"
exit 1
fi
else
echo "Warning: fish shell detected." echo "Warning: fish shell detected."
echo "This script is written for bash and may have syntax issues under fish." echo "This script must be run with bash, not fish (bash-only syntax)."
echo "Please switch to bash first and re-run it, e.g.: bash $0" echo "Please run it with bash, e.g.: bash installbeta.sh"
read -r -p "Press Enter to continue anyway, or Ctrl+C to cancel..." </dev/tty || true read -r -p "Press Enter to continue anyway, or Ctrl+C to cancel..." </dev/tty || true
fi fi
fi
if [ "$skip_watermark" = false ]; then if [ "$skip_watermark" = false ]; then
clear clear
@@ -133,7 +141,7 @@ else
fi fi
# Fail on any command. # Fail on any command.
set -eu pipefail set -euo pipefail
# Process selected options # Process selected options
for selection in $CHOICE; do for selection in $CHOICE; do
@@ -146,7 +154,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash zsh.sh --skip-watermark bash zsh.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh | bash -s -- --skip-watermark
fi fi
;; ;;
"2") "2")
@@ -156,7 +164,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash fish.sh --skip-watermark bash fish.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/fish.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/fish.sh | bash -s -- --skip-watermark
fi fi
;; ;;
"3") "3")
@@ -261,7 +269,7 @@ for selection in $CHOICE; do
echo "Found local script, running..." echo "Found local script, running..."
bash bat.sh --skip-watermark bash bat.sh --skip-watermark
else else
bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/bat.sh)" --skip-watermark curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/bat.sh | bash -s -- --skip-watermark
fi fi
;; ;;
*) *)