Revision of Zsh Setup

weehong revised this gist 3 months ago. Go to revision

2 files changed, 304 insertions, 14 deletions

zsh_ubuntu.sh

			@@ -50,7 +50,6 @@ detect_os() {
50	50		# REQUIREMENTS
51	51		# =============================
52	52		check_requirements() {
53		-	# Fixed to prevent silent failure with 'set -e'
54	53		if [[ $EUID -eq 0 ]]; then
55	54		err "Do not run as root"
56	55		exit 1
			@@ -131,7 +130,6 @@ configure_shell() {
131	130		install_oh_my_zsh() {
132	131		[[ -d "$HOME/.oh-my-zsh" ]] && ok "Oh My Zsh already installed" && return
133	132		log "Installing Oh My Zsh..."
134		-	# Keep zshrc ensures we don't blow away configs if they exist
135	133		RUNZSH=no CHSH=no KEEP_ZSHRC=yes \
136	134		sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
137	135		ok "Oh My Zsh installed"
			@@ -164,6 +162,13 @@ download_configs() {
164	162		fi
165	163		log "Fetching $f ..."
166	164		curl -fsSL "${CONFIG_FILES[$f]}" -o "$HOME/$f" \|\| warn "Failed to download $f"
	165	+
	166	+	# --- Logic to remove the open function from .func ---
	167	+	if [[ "$f" == ".func" ]]; then
	168	+	# Removes the block starting with open() { and ending with }
	169	+	sed -i '/^open[[:space:]]()[[:space:]]{/,/^}/d' "$HOME/$f"
	170	+	ok "Stripped 'open' function from .func to prevent system conflicts"
	171	+	fi
167	172		done
168	173		ok "Configs downloaded (Backup at $backup)"
169	174		}
			@@ -172,13 +177,11 @@ update_zshrc() {
172	177		local zshrc="$HOME/.zshrc"
173	178		log "Updating .zshrc..."
174	179
175		-	# Create zshrc if missing to prevent errors
176	180		if [[ ! -f "$zshrc" ]]; then
177	181		warn ".zshrc not found, creating new one..."
178	182		touch "$zshrc"
179	183		fi
180	184
181		-	# Use \|\| true to prevent 'set -e' from exiting if grep finds nothing
182	185		grep -q 'ZSH_THEME="spaceship"' "$zshrc" \|\| sed -i 's/ZSH_THEME=".*"/ZSH_THEME="spaceship"/' "$zshrc"
183	186		grep -q 'zsh-autosuggestions' "$zshrc" \|\| sed -i 's/plugins=(/plugins=(zsh-autosuggestions /' "$zshrc"
184	187		grep -q 'zsh-syntax-highlighting' "$zshrc" \|\| sed -i 's/plugins=(/plugins=(zsh-syntax-highlighting /' "$zshrc"
			@@ -187,14 +190,10 @@ update_zshrc() {
187	190
188	191		switch_shell() {
189	192		$SKIP_SHELL_CHANGE && return
190		-
191	193		log "Starting Zsh session..."
192	194		echo -e "${YELLOW}Type 'exit' to return to this installer menu.${NC}"
193	195		echo "----------------------------------------"
194		-
195		-	# Run zsh as a subprocess, not exec
196	196		zsh -l
197		-
198	197		echo "----------------------------------------"
199	198		ok "Returned from Zsh session"
200	199		}
			@@ -222,21 +221,19 @@ show_menu() {
222	221		echo "13) Switch to Zsh (Temporary Sub-shell)"
223	222		echo "14) Quit"
224	223		echo "==========================================="
225		-	echo "Inputs: '0' (All), '2 3 7' (Specific), '0 !4 !6' (All except 4 and 6)"
226	224		}
227	225
228	226		run_choices() {
229	227		local input
230	228		read -p "Select: " input
231		-	input="${input//,/ }" # replace commas with spaces
	229	+	input="${input//,/ }"
232	230
233	231		local -a to_run=()
234	232		local -a to_exclude=()
235	233
236		-	# Parse positive selections and negative exclusions
237	234		for item in $input; do
238	235		if [[ "$item" == !* ]]; then
239		-	to_exclude+=("${item:1}") # Strip the '!' character
	236	+	to_exclude+=("${item:1}")
240	237		elif [[ "$item" == "0" ]]; then
241	238		to_run+=(1 2 3 4 5 6 7 8 9 10 11 12 13)
242	239		else
			@@ -244,9 +241,7 @@ run_choices() {
244	241		fi
245	242		done
246	243
247		-	# Loop through intended runs and apply exclusions
248	244		for choice in "${to_run[@]}"; do
249		-
250	245		local skip=false
251	246		for ex in "${to_exclude[@]}"; do
252	247		if [[ "$choice" == "$ex" ]]; then

zsh_wsl.sh(file created)

		@@ -0,0 +1,295 @@
1	+	#!/bin/bash
2	+	set -euo pipefail
3	+
4	+	# =============================
5	+	# COLORS & LOGGING
6	+	# =============================
7	+	RED='\033[0;31m'
8	+	GREEN='\033[0;32m'
9	+	YELLOW='\033[1;33m'
10	+	BLUE='\033[0;34m'
11	+	NC='\033[0m'
12	+
13	+	log() { echo -e "${BLUE}[INFO]${NC} $*"; }
14	+	ok() { echo -e "${GREEN}[OK]${NC} $*"; }
15	+	warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
16	+	err() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
17	+
18	+	# =============================
19	+	# FLAGS & CONFIG
20	+	# =============================
21	+	SKIP_PACKAGES=false
22	+	SKIP_GIT_CONFIG=false
23	+	SKIP_SHELL_CHANGE=false
24	+	CUSTOM_CONFIG=false
25	+	SKIP_XCLIP=false
26	+	INSTALL_HOMEBREW=false
27	+
28	+	declare -A CONFIG_FILES=(
29	+	[".alias"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/alias"
30	+	[".func"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/func"
31	+	[".pathrc"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/pathrc"
32	+	[".sourcerc"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/sourcerc"
33	+	[".vimrc"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/vimrc"
34	+	[".zshrc"]="https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/zshrc"
35	+	)
36	+
37	+	# =============================
38	+	# OS DETECTION
39	+	# =============================
40	+	detect_os() {
41	+	if [ -f /etc/os-release ]; then
42	+	. /etc/os-release
43	+	echo "$ID"
44	+	else
45	+	echo "unknown"
46	+	fi
47	+	}
48	+
49	+	# =============================
50	+	# REQUIREMENTS
51	+	# =============================
52	+	check_requirements() {
53	+	# Fixed to prevent silent failure with 'set -e'
54	+	if [[ $EUID -eq 0 ]]; then
55	+	err "Do not run as root"
56	+	exit 1
57	+	fi
58	+	if ! command -v sudo >/dev/null; then
59	+	err "sudo required"
60	+	exit 1
61	+	fi
62	+	}
63	+
64	+	# =============================
65	+	# INSTALLATION FUNCTIONS
66	+	# =============================
67	+	update_system() {
68	+	$SKIP_PACKAGES && return
69	+	log "Updating system..."
70	+	sudo apt-get update -y
71	+	sudo apt-get upgrade -y
72	+	ok "System updated"
73	+	}
74	+
75	+	install_packages() {
76	+	$SKIP_PACKAGES && return
77	+	log "Installing core packages..."
78	+	sudo apt-get install -y \
79	+	zsh git vim curl wget unzip zip build-essential xz-utils
80	+	ok "Packages installed"
81	+	}
82	+
83	+	set_timezone() {
84	+	log "Setting timezone to Asia/Singapore..."
85	+	sudo timedatectl set-timezone Asia/Singapore
86	+	ok "Timezone set to Asia/Singapore"
87	+	}
88	+
89	+	install_xclip() {
90	+	local os
91	+	os=$(detect_os)
92	+	[[ "$os" != "ubuntu" && "$os" != "debian" ]] && return 0
93	+	$SKIP_XCLIP && return 0
94	+	command -v xclip >/dev/null && ok "xclip already installed" && return 0
95	+
96	+	read -r -p "Install xclip? (y/N): " r
97	+	case "$r" in
98	+	[Yy]) sudo apt-get install -y xclip; ok "xclip installed" ;;
99	+	*) log "Skipping xclip installation" ;;
100	+	esac
101	+	}
102	+
103	+	configure_git() {
104	+	$SKIP_GIT_CONFIG && return
105	+	log "Configuring Git..."
106	+	read -p "Git name (leave empty to skip): " name
107	+	read -p "Git email (leave empty to skip): " email
108	+	[[ -n "$name" ]] && git config --global user.name "$name"
109	+	[[ -n "$email" ]] && git config --global user.email "$email"
110	+	ok "Git configured"
111	+	}
112	+
113	+	install_homebrew() {
114	+	! $INSTALL_HOMEBREW && return
115	+	command -v brew >/dev/null && ok "Homebrew already installed" && return
116	+	log "Installing Homebrew..."
117	+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
118	+	ok "Homebrew installed"
119	+	}
120	+
121	+	configure_shell() {
122	+	$SKIP_SHELL_CHANGE && return
123	+	log "Changing default shell to zsh..."
124	+	local zsh_path
125	+	zsh_path=$(command -v zsh)
126	+	grep -qx "$zsh_path" /etc/shells \|\| echo "$zsh_path" \| sudo tee -a /etc/shells >/dev/null
127	+	sudo chsh -s "$zsh_path" "$USER"
128	+	ok "Shell changed (requires logout/login to take effect)"
129	+	}
130	+
131	+	install_oh_my_zsh() {
132	+	[[ -d "$HOME/.oh-my-zsh" ]] && ok "Oh My Zsh already installed" && return
133	+	log "Installing Oh My Zsh..."
134	+	# Keep zshrc ensures we don't blow away configs if they exist
135	+	RUNZSH=no CHSH=no KEEP_ZSHRC=yes \
136	+	sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
137	+	ok "Oh My Zsh installed"
138	+	}
139	+
140	+	install_plugins() {
141	+	log "Installing plugins..."
142	+	local dir="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins"
143	+	[[ -d "$dir/zsh-autosuggestions" ]] \|\| git clone https://github.com/zsh-users/zsh-autosuggestions "$dir/zsh-autosuggestions"
144	+	[[ -d "$dir/zsh-syntax-highlighting" ]] \|\| git clone https://github.com/zsh-users/zsh-syntax-highlighting "$dir/zsh-syntax-highlighting"
145	+	ok "Plugins installed"
146	+	}
147	+
148	+	install_theme() {
149	+	log "Installing Spaceship theme..."
150	+	local themes="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes"
151	+	local dir="$themes/spaceship-prompt"
152	+	[[ -d "$dir" ]] \|\| git clone https://github.com/spaceship-prompt/spaceship-prompt.git "$dir" --depth=1
153	+	ln -sf "$dir/spaceship.zsh-theme" "$themes/spaceship.zsh-theme"
154	+	ok "Theme installed"
155	+	}
156	+
157	+	download_configs() {
158	+	log "Downloading custom config files..."
159	+	local backup="$HOME/.config_backup_$(date +%Y%m%d_%H%M%S)"
160	+	mkdir -p "$backup"
161	+	for f in "${!CONFIG_FILES[@]}"; do
162	+	if [[ -f "$HOME/$f" ]]; then
163	+	cp "$HOME/$f" "$backup/"
164	+	fi
165	+	log "Fetching $f ..."
166	+	curl -fsSL "${CONFIG_FILES[$f]}" -o "$HOME/$f" \|\| warn "Failed to download $f"
167	+	done
168	+	ok "Configs downloaded (Backup at $backup)"
169	+	}
170	+
171	+	update_zshrc() {
172	+	local zshrc="$HOME/.zshrc"
173	+	log "Updating .zshrc..."
174	+
175	+	# Create zshrc if missing to prevent errors
176	+	if [[ ! -f "$zshrc" ]]; then
177	+	warn ".zshrc not found, creating new one..."
178	+	touch "$zshrc"
179	+	fi
180	+
181	+	# Use \|\| true to prevent 'set -e' from exiting if grep finds nothing
182	+	grep -q 'ZSH_THEME="spaceship"' "$zshrc" \|\| sed -i 's/ZSH_THEME=".*"/ZSH_THEME="spaceship"/' "$zshrc"
183	+	grep -q 'zsh-autosuggestions' "$zshrc" \|\| sed -i 's/plugins=(/plugins=(zsh-autosuggestions /' "$zshrc"
184	+	grep -q 'zsh-syntax-highlighting' "$zshrc" \|\| sed -i 's/plugins=(/plugins=(zsh-syntax-highlighting /' "$zshrc"
185	+	ok ".zshrc updated with plugins and theme"
186	+	}
187	+
188	+	switch_shell() {
189	+	$SKIP_SHELL_CHANGE && return
190	+
191	+	log "Starting Zsh session..."
192	+	echo -e "${YELLOW}Type 'exit' to return to this installer menu.${NC}"
193	+	echo "----------------------------------------"
194	+
195	+	# Run zsh as a subprocess, not exec
196	+	zsh -l
197	+
198	+	echo "----------------------------------------"
199	+	ok "Returned from Zsh session"
200	+	}
201	+
202	+	# =============================
203	+	# INTERACTIVE MENU
204	+	# =============================
205	+	show_menu() {
206	+	echo "==========================================="
207	+	echo "Zsh Installer - Choose what to do"
208	+	echo "==========================================="
209	+	echo " 0) Run ALL steps (1-13)"
210	+	echo " 1) Update system packages"
211	+	echo " 2) Install core packages (zsh, git, vim, etc.)"
212	+	echo " 3) Set Timezone (Asia/Singapore)"
213	+	echo " 4) Install xclip"
214	+	echo " 5) Configure Git"
215	+	echo " 6) Install Homebrew"
216	+	echo " 7) Configure shell (chsh - sets default shell)"
217	+	echo " 8) Install Oh My Zsh"
218	+	echo " 9) Install plugins (autosuggestions, syntax highlighting)"
219	+	echo "10) Install Spaceship theme"
220	+	echo "11) Download custom configs (~/.alias, .vimrc, etc.)"
221	+	echo "12) Update ~/.zshrc for plugins & theme"
222	+	echo "13) Switch to Zsh (Temporary Sub-shell)"
223	+	echo "14) Quit"
224	+	echo "==========================================="
225	+	echo "Inputs: '0' (All), '2 3 7' (Specific), '0 !4 !6' (All except 4 and 6)"
226	+	}
227	+
228	+	run_choices() {
229	+	local input
230	+	read -p "Select: " input
231	+	input="${input//,/ }" # replace commas with spaces
232	+
233	+	local -a to_run=()
234	+	local -a to_exclude=()
235	+
236	+	# Parse positive selections and negative exclusions
237	+	for item in $input; do
238	+	if [[ "$item" == !* ]]; then
239	+	to_exclude+=("${item:1}") # Strip the '!' character
240	+	elif [[ "$item" == "0" ]]; then
241	+	to_run+=(1 2 3 4 5 6 7 8 9 10 11 12 13)
242	+	else
243	+	to_run+=("$item")
244	+	fi
245	+	done
246	+
247	+	# Loop through intended runs and apply exclusions
248	+	for choice in "${to_run[@]}"; do
249	+
250	+	local skip=false
251	+	for ex in "${to_exclude[@]}"; do
252	+	if [[ "$choice" == "$ex" ]]; then
253	+	skip=true
254	+	break
255	+	fi
256	+	done
257	+
258	+	$skip && continue
259	+
260	+	case "$choice" in
261	+	1) update_system ;;
262	+	2) install_packages ;;
263	+	3) set_timezone ;;
264	+	4) install_xclip ;;
265	+	5) configure_git ;;
266	+	6) install_homebrew ;;
267	+	7) configure_shell ;;
268	+	8) install_oh_my_zsh ;;
269	+	9) install_plugins ;;
270	+	10) install_theme ;;
271	+	11) download_configs ;;
272	+	12) update_zshrc ;;
273	+	13) switch_shell ;;
274	+	14) log "Exiting..."; exit 0 ;;
275	+	*) warn "Skipping invalid option: $choice" ;;
276	+	esac
277	+	echo
278	+	done
279	+	}
280	+
281	+	# =============================
282	+	# MAIN
283	+	# =============================
284	+	main() {
285	+	check_requirements
286	+	while true; do
287	+	show_menu
288	+	run_choices
289	+	read -p "Do you want to run more options? (y/n): " again
290	+	[[ "$again" =~ ^[Yy]$ ]] \|\| break
291	+	done
292	+	ok "Zsh installation/configuration complete!"
293	+	}
294	+
295	+	main "$@"

weehong revised this gist 3 months ago. Go to revision

1 file changed, 17 insertions, 12 deletions

zsh_macos.sh

			@@ -94,13 +94,19 @@ clean_macos_aliases() {
94	94		fi
95	95		}
96	96
97		-	clean_pathrc() {
98		-	local pathrc_file="$HOME/.pathrc"
99		-	if [[ -f "$pathrc_file" ]]; then
100		-	log "Patching .pathrc to remove 'open' function..."
101		-	# Deletes the function block from name down to the closing brace }
102		-	sed -i '' '/^open[ (].*/,/^}/d' "$pathrc_file"
103		-	ok "'open' function removed from .pathrc"
	97	+	clean_func_file() {
	98	+	local func_file="$HOME/.func"
	99	+	if [[ -f "$func_file" ]]; then
	100	+	log "Patching .func to remove 'open' function (WSL/Explorer specific)..."
	101	+
	102	+	# Deletes from the comment line containing 'Function: open' down to the closing brace }
	103	+	# This preserves the native macOS 'open' command.
	104	+	sed -i '' '/# Function: open/,/^}/d' "$func_file"
	105	+
	106	+	# Trim leading blank lines that might remain at the top
	107	+	sed -i '' '/./,$!d' "$func_file"
	108	+
	109	+	ok "'open' function removed from .func"
104	110		fi
105	111		}
106	112
			@@ -120,8 +126,9 @@ download_configs() {
120	126		curl -fsSL "$url" -o "$HOME/$f" \|\| warn "Failed to download $f"
121	127		done
122	128
	129	+	# Run cleanup patches
123	130		clean_macos_aliases
124		-	clean_pathrc
	131	+	clean_func_file
125	132
126	133		ok "Configs downloaded (Backup at $backup)"
127	134		}
			@@ -162,7 +169,7 @@ show_menu() {
162	169		echo " 2) Install Oh My Zsh"
163	170		echo " 3) Install plugins (autosuggestions, syntax highlighting)"
164	171		echo " 4) Install Spaceship theme"
165		-	echo " 5) Download custom configs (~/.alias, .vimrc, etc.)"
	172	+	echo " 5) Download custom configs (~/.alias, .func, .vimrc, etc.)"
166	173		echo " 6) Update ~/.zshrc for plugins & theme"
167	174		echo " 7) Switch to Zsh (Temporary Sub-shell)"
168	175		echo " 8) Quit"
			@@ -177,7 +184,6 @@ run_choices() {
177	184		local -a to_run=()
178	185		local -a to_exclude=()
179	186
180		-	# Parse inputs
181	187		for item in $input; do
182	188		if [[ "$item" == !* ]]; then
183	189		to_exclude+=("${item:1}")
			@@ -188,12 +194,11 @@ run_choices() {
188	194		fi
189	195		done
190	196
191		-	# Fixed: Loop logic to handle empty arrays in older Bash versions
192	197		if [[ ${#to_run[@]} -gt 0 ]]; then
193	198		for choice in "${to_run[@]}"; do
194	199		local skip=false
195	200
196		-	# Only loop if exclusions exist to avoid "unbound variable" error
	201	+	# Array empty-check for older Bash versions (Fixes 'unbound variable' error)
197	202		if [[ ${#to_exclude[@]} -gt 0 ]]; then
198	203		for ex in "${to_exclude[@]}"; do
199	204		if [[ "$choice" == "$ex" ]]; then

weehong revised this gist 3 months ago. Go to revision

1 file changed, 11 insertions, 6 deletions

zsh_macos.sh

			@@ -120,7 +120,6 @@ download_configs() {
120	120		curl -fsSL "$url" -o "$HOME/$f" \|\| warn "Failed to download $f"
121	121		done
122	122
123		-	# Apply cleanup patches
124	123		clean_macos_aliases
125	124		clean_pathrc
126	125
			@@ -178,6 +177,7 @@ run_choices() {
178	177		local -a to_run=()
179	178		local -a to_exclude=()
180	179
	180	+	# Parse inputs
181	181		for item in $input; do
182	182		if [[ "$item" == !* ]]; then
183	183		to_exclude+=("${item:1}")
			@@ -188,14 +188,19 @@ run_choices() {
188	188		fi
189	189		done
190	190
	191	+	# Fixed: Loop logic to handle empty arrays in older Bash versions
191	192		if [[ ${#to_run[@]} -gt 0 ]]; then
192	193		for choice in "${to_run[@]}"; do
193	194		local skip=false
194		-	for ex in "${to_exclude[@]}"; do
195		-	if [[ "$choice" == "$ex" ]]; then
196		-	skip=true; break
197		-	fi
198		-	done
	195	+
	196	+	# Only loop if exclusions exist to avoid "unbound variable" error
	197	+	if [[ ${#to_exclude[@]} -gt 0 ]]; then
	198	+	for ex in "${to_exclude[@]}"; do
	199	+	if [[ "$choice" == "$ex" ]]; then
	200	+	skip=true; break
	201	+	fi
	202	+	done
	203	+	fi
199	204
200	205		$skip && continue
201	206

weehong revised this gist 3 months ago. Go to revision

1 file changed, 21 insertions, 30 deletions

zsh_macos.sh

			@@ -87,22 +87,20 @@ clean_macos_aliases() {
87	87		local alias_file="$HOME/.alias"
88	88		if [[ -f "$alias_file" ]]; then
89	89		log "Patching .alias for macOS..."
90		-
91		-	# Delete the multiline apt-get block (from the comment down to the final command)
92	90		sed -i '' '/# System update & cleanup/,/sudo apt-get clean/d' "$alias_file"
93		-
94		-	# Delete the xclip block
95	91		sed -i '' '/# xclip shortcuts/,/xclip -selection clipboard/d' "$alias_file"
96		-
97		-	# Trim leading blank lines from the top of the file
98	92		sed -i '' '/./,$!d' "$alias_file"
99		-
100		-	# Trim trailing blank lines from the bottom of the file
101		-	local cleaned_content
102		-	cleaned_content=$(cat "$alias_file")
103		-	printf "%s\n" "$cleaned_content" > "$alias_file"
104		-
105		-	ok "macOS incompatibilities and extra blank lines removed from .alias"
	93	+	ok "macOS incompatibilities removed from .alias"
	94	+	fi
	95	+	}
	96	+
	97	+	clean_pathrc() {
	98	+	local pathrc_file="$HOME/.pathrc"
	99	+	if [[ -f "$pathrc_file" ]]; then
	100	+	log "Patching .pathrc to remove 'open' function..."
	101	+	# Deletes the function block from name down to the closing brace }
	102	+	sed -i '' '/^open[ (].*/,/^}/d' "$pathrc_file"
	103	+	ok "'open' function removed from .pathrc"
106	104		fi
107	105		}
108	106
			@@ -122,8 +120,9 @@ download_configs() {
122	120		curl -fsSL "$url" -o "$HOME/$f" \|\| warn "Failed to download $f"
123	121		done
124	122
125		-	# Automatically clean up the macOS incompatible aliases after downloading
	123	+	# Apply cleanup patches
126	124		clean_macos_aliases
	125	+	clean_pathrc
127	126
128	127		ok "Configs downloaded (Backup at $backup)"
129	128		}
			@@ -137,7 +136,6 @@ update_zshrc() {
137	136		touch "$zshrc"
138	137		fi
139	138
140		-	# macOS BSD sed requires '-i ''' for in-place editing
141	139		grep -q 'ZSH_THEME="spaceship"' "$zshrc" \|\| sed -i '' 's/ZSH_THEME=".*"/ZSH_THEME="spaceship"/' "$zshrc"
142	140		grep -q 'zsh-autosuggestions' "$zshrc" \|\| sed -i '' 's/plugins=(/plugins=(zsh-autosuggestions /' "$zshrc"
143	141		grep -q 'zsh-syntax-highlighting' "$zshrc" \|\| sed -i '' 's/plugins=(/plugins=(zsh-syntax-highlighting /' "$zshrc"
			@@ -170,21 +168,19 @@ show_menu() {
170	168		echo " 7) Switch to Zsh (Temporary Sub-shell)"
171	169		echo " 8) Quit"
172	170		echo "==========================================="
173		-	echo "Inputs: '0' (All), '1 3 4' (Specific), '0 !1 !5' (All except 1 and 5)"
174	171		}
175	172
176	173		run_choices() {
177	174		local input
178	175		read -p "Select: " input
179		-	input="${input//,/ }" # replace commas with spaces if used
	176	+	input="${input//,/ }"
180	177
181	178		local -a to_run=()
182	179		local -a to_exclude=()
183	180
184		-	# Parse positive selections and negative exclusions
185	181		for item in $input; do
186	182		if [[ "$item" == !* ]]; then
187		-	to_exclude+=("${item:1}") # Strip the '!' character
	183	+	to_exclude+=("${item:1}")
188	184		elif [[ "$item" == "0" ]]; then
189	185		to_run+=(1 2 3 4 5 6 7)
190	186		else
			@@ -192,19 +188,14 @@ run_choices() {
192	188		fi
193	189		done
194	190
195		-	# Protect against empty arrays crashing older bash versions with 'set -u'
196	191		if [[ ${#to_run[@]} -gt 0 ]]; then
197	192		for choice in "${to_run[@]}"; do
198		-
199	193		local skip=false
200		-	if [[ ${#to_exclude[@]} -gt 0 ]]; then
201		-	for ex in "${to_exclude[@]}"; do
202		-	if [[ "$choice" == "$ex" ]]; then
203		-	skip=true
204		-	break
205		-	fi
206		-	done
207		-	fi
	194	+	for ex in "${to_exclude[@]}"; do
	195	+	if [[ "$choice" == "$ex" ]]; then
	196	+	skip=true; break
	197	+	fi
	198	+	done
208	199
209	200		$skip && continue
210	201
			@@ -216,7 +207,7 @@ run_choices() {
216	207		5) download_configs ;;
217	208		6) update_zshrc ;;
218	209		7) switch_shell ;;
219		-	8) log "Exiting..."; exit 0 ;;
	210	+	8) exit 0 ;;
220	211		*) warn "Skipping invalid option: $choice" ;;
221	212		esac
222	213		echo

weehong revised this gist 3 months ago. Go to revision

1 file changed, 10 insertions, 2 deletions

zsh_macos.sh

			@@ -86,7 +86,7 @@ install_theme() {
86	86		clean_macos_aliases() {
87	87		local alias_file="$HOME/.alias"
88	88		if [[ -f "$alias_file" ]]; then
89		-	log "Patching .alias for macOS (removing apt-get and xclip blocks)..."
	89	+	log "Patching .alias for macOS..."
90	90
91	91		# Delete the multiline apt-get block (from the comment down to the final command)
92	92		sed -i '' '/# System update & cleanup/,/sudo apt-get clean/d' "$alias_file"
			@@ -94,7 +94,15 @@ clean_macos_aliases() {
94	94		# Delete the xclip block
95	95		sed -i '' '/# xclip shortcuts/,/xclip -selection clipboard/d' "$alias_file"
96	96
97		-	ok "macOS incompatibilities removed from .alias"
	97	+	# Trim leading blank lines from the top of the file
	98	+	sed -i '' '/./,$!d' "$alias_file"
	99	+
	100	+	# Trim trailing blank lines from the bottom of the file
	101	+	local cleaned_content
	102	+	cleaned_content=$(cat "$alias_file")
	103	+	printf "%s\n" "$cleaned_content" > "$alias_file"
	104	+
	105	+	ok "macOS incompatibilities and extra blank lines removed from .alias"
98	106		fi
99	107		}
100	108

weehong revised this gist 3 months ago. Go to revision

1 file changed, 29 insertions, 1 deletion

zsh_macos.sh

			@@ -202,4 +202,32 @@ run_choices() {
202	202
203	203		case "$choice" in
204	204		1) configure_git ;;
205		-	2) install_oh_my_
	205	+	2) install_oh_my_zsh ;;
	206	+	3) install_plugins ;;
	207	+	4) install_theme ;;
	208	+	5) download_configs ;;
	209	+	6) update_zshrc ;;
	210	+	7) switch_shell ;;
	211	+	8) log "Exiting..."; exit 0 ;;
	212	+	*) warn "Skipping invalid option: $choice" ;;
	213	+	esac
	214	+	echo
	215	+	done
	216	+	fi
	217	+	}
	218	+
	219	+	# =============================
	220	+	# MAIN
	221	+	# =============================
	222	+	main() {
	223	+	check_requirements
	224	+	while true; do
	225	+	show_menu
	226	+	run_choices
	227	+	read -p "Do you want to run more options? (y/n): " again
	228	+	[[ "$again" =~ ^[Yy]$ ]] \|\| break
	229	+	done
	230	+	ok "macOS configuration complete!"
	231	+	}
	232	+
	233	+	main "$@"

weehong revised this gist 3 months ago. Go to revision

1 file changed, 17 insertions, 43 deletions

zsh_macos.sh

			@@ -184,48 +184,22 @@ run_choices() {
184	184		fi
185	185		done
186	186
187		-	# Loop through the intended runs and apply the exclusions
188		-	for choice in "${to_run[@]}"; do
189		-
190		-	# Check if the current choice is in the exclusion array
191		-	local skip=false
192		-	for ex in "${to_exclude[@]}"; do
193		-	if [[ "$choice" == "$ex" ]]; then
194		-	skip=true
195		-	break
	187	+	# Protect against empty arrays crashing older bash versions with 'set -u'
	188	+	if [[ ${#to_run[@]} -gt 0 ]]; then
	189	+	for choice in "${to_run[@]}"; do
	190	+
	191	+	local skip=false
	192	+	if [[ ${#to_exclude[@]} -gt 0 ]]; then
	193	+	for ex in "${to_exclude[@]}"; do
	194	+	if [[ "$choice" == "$ex" ]]; then
	195	+	skip=true
	196	+	break
	197	+	fi
	198	+	done
196	199		fi
197		-	done
198		-
199		-	# If skip is true, jump to the next iteration of the loop without doing anything
200		-	$skip && continue
201		-
202		-	case "$choice" in
203		-	1) configure_git ;;
204		-	2) install_oh_my_zsh ;;
205		-	3) install_plugins ;;
206		-	4) install_theme ;;
207		-	5) download_configs ;;
208		-	6) update_zshrc ;;
209		-	7) switch_shell ;;
210		-	8) log "Exiting..."; exit 0 ;;
211		-	*) warn "Skipping invalid option: $choice" ;;
212		-	esac
213		-	echo
214		-	done
215		-	}
216		-
217		-	# =============================
218		-	# MAIN
219		-	# =============================
220		-	main() {
221		-	check_requirements
222		-	while true; do
223		-	show_menu
224		-	run_choices
225		-	read -p "Do you want to run more options? (y/n): " again
226		-	[[ "$again" =~ ^[Yy]$ ]] \|\| break
227		-	done
228		-	ok "macOS configuration complete!"
229		-	}
	200	+
	201	+	$skip && continue
230	202
231		-	main "$@"
	203	+	case "$choice" in
	204	+	1) configure_git ;;
	205	+	2) install_oh_my_

weehong revised this gist 3 months ago. Go to revision

1 file changed, 19 insertions

zsh_macos.sh

			@@ -83,6 +83,21 @@ install_theme() {
83	83		ok "Theme installed"
84	84		}
85	85
	86	+	clean_macos_aliases() {
	87	+	local alias_file="$HOME/.alias"
	88	+	if [[ -f "$alias_file" ]]; then
	89	+	log "Patching .alias for macOS (removing apt-get and xclip blocks)..."
	90	+
	91	+	# Delete the multiline apt-get block (from the comment down to the final command)
	92	+	sed -i '' '/# System update & cleanup/,/sudo apt-get clean/d' "$alias_file"
	93	+
	94	+	# Delete the xclip block
	95	+	sed -i '' '/# xclip shortcuts/,/xclip -selection clipboard/d' "$alias_file"
	96	+
	97	+	ok "macOS incompatibilities removed from .alias"
	98	+	fi
	99	+	}
	100	+
86	101		download_configs() {
87	102		log "Downloading custom config files..."
88	103		local backup="$HOME/.config_backup_$(date +%Y%m%d_%H%M%S)"
			@@ -98,6 +113,10 @@ download_configs() {
98	113		log "Fetching $f ..."
99	114		curl -fsSL "$url" -o "$HOME/$f" \|\| warn "Failed to download $f"
100	115		done
	116	+
	117	+	# Automatically clean up the macOS incompatible aliases after downloading
	118	+	clean_macos_aliases
	119	+
101	120		ok "Configs downloaded (Backup at $backup)"
102	121		}
103	122

weehong revised this gist 3 months ago. Go to revision

1 file changed, 5 insertions, 2 deletions

README.md

			@@ -2,8 +2,11 @@
2	2		The "Bash Script Installer" simplifies the setup of Zsh.
3	3
4	4		## Zsh
5		-	```
	5	+	### Ubuntu
	6	+	```zsh
6	7		bash -c "$(curl -fsSL https://opengist.rmrf.online/weehong/f0d940c3c1214bf5b7996195199fdc09/raw/HEAD/zsh_ubuntu.sh)"
	8	+	```
	9	+	### MacOS
	10	+	```zsh
7	11		bash -c "$(curl -fsSL https://opengist.rmrf.online/weehong/f0d940c3c1214bf5b7996195199fdc09/raw/HEAD/zsh_macos.sh)"
8		-
9	12		```

weehong revised this gist 3 months ago. Go to revision

3 files changed, 253 insertions, 8 deletions

README.md

			@@ -3,5 +3,7 @@ The "Bash Script Installer" simplifies the setup of Zsh.
3	3
4	4		## Zsh
5	5		```
6		-	bash -c "$(curl -fsSL https://opengist.rmrf.online/weehong/f0d940c3c1214bf5b7996195199fdc09/raw/HEAD/zsh.sh)"
	6	+	bash -c "$(curl -fsSL https://opengist.rmrf.online/weehong/f0d940c3c1214bf5b7996195199fdc09/raw/HEAD/zsh_ubuntu.sh)"
	7	+	bash -c "$(curl -fsSL https://opengist.rmrf.online/weehong/f0d940c3c1214bf5b7996195199fdc09/raw/HEAD/zsh_macos.sh)"
	8	+
7	9		```

zsh_macos.sh(file created)

		@@ -0,0 +1,212 @@
1	+	#!/bin/bash
2	+	set -euo pipefail
3	+
4	+	# =============================
5	+	# COLORS & LOGGING
6	+	# =============================
7	+	RED='\033[0;31m'
8	+	GREEN='\033[0;32m'
9	+	YELLOW='\033[1;33m'
10	+	BLUE='\033[0;34m'
11	+	NC='\033[0m'
12	+
13	+	log() { echo -e "${BLUE}[INFO]${NC} $*"; }
14	+	ok() { echo -e "${GREEN}[OK]${NC} $*"; }
15	+	warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
16	+	err() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
17	+
18	+	# =============================
19	+	# CONFIG
20	+	# =============================
21	+	CONFIG_FILES=(
22	+	".alias\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/alias"
23	+	".func\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/func"
24	+	".pathrc\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/pathrc"
25	+	".sourcerc\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/sourcerc"
26	+	".vimrc\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/vimrc"
27	+	".zshrc\|https://gist.githubusercontent.com/weehongkoh/72bdb76beacacf2ca3dd39a72395b9ee/raw/zshrc"
28	+	)
29	+
30	+	# =============================
31	+	# REQUIREMENTS
32	+	# =============================
33	+	check_requirements() {
34	+	if [[ $EUID -eq 0 ]]; then
35	+	err "Do not run as root on macOS"
36	+	exit 1
37	+	fi
38	+	}
39	+
40	+	# =============================
41	+	# INSTALLATION FUNCTIONS
42	+	# =============================
43	+	configure_git() {
44	+	log "Configuring Git..."
45	+	read -p "Git name (leave empty to skip): " name
46	+	read -p "Git email (leave empty to skip): " email
47	+
48	+	if [[ -n "$name" ]]; then
49	+	git config --global user.name "$name"
50	+	fi
51	+	if [[ -n "$email" ]]; then
52	+	git config --global user.email "$email"
53	+	fi
54	+	ok "Git configured"
55	+	}
56	+
57	+	install_oh_my_zsh() {
58	+	if [[ -d "$HOME/.oh-my-zsh" ]]; then
59	+	ok "Oh My Zsh already installed"
60	+	return
61	+	fi
62	+
63	+	log "Installing Oh My Zsh..."
64	+	RUNZSH=no CHSH=no KEEP_ZSHRC=yes \
65	+	sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
66	+	ok "Oh My Zsh installed"
67	+	}
68	+
69	+	install_plugins() {
70	+	log "Installing plugins..."
71	+	local dir="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins"
72	+	[[ -d "$dir/zsh-autosuggestions" ]] \|\| git clone https://github.com/zsh-users/zsh-autosuggestions "$dir/zsh-autosuggestions"
73	+	[[ -d "$dir/zsh-syntax-highlighting" ]] \|\| git clone https://github.com/zsh-users/zsh-syntax-highlighting "$dir/zsh-syntax-highlighting"
74	+	ok "Plugins installed"
75	+	}
76	+
77	+	install_theme() {
78	+	log "Installing Spaceship theme..."
79	+	local themes="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes"
80	+	local dir="$themes/spaceship-prompt"
81	+	[[ -d "$dir" ]] \|\| git clone https://github.com/spaceship-prompt/spaceship-prompt.git "$dir" --depth=1
82	+	ln -sf "$dir/spaceship.zsh-theme" "$themes/spaceship.zsh-theme"
83	+	ok "Theme installed"
84	+	}
85	+
86	+	download_configs() {
87	+	log "Downloading custom config files..."
88	+	local backup="$HOME/.config_backup_$(date +%Y%m%d_%H%M%S)"
89	+	mkdir -p "$backup"
90	+
91	+	for entry in "${CONFIG_FILES[@]}"; do
92	+	local f="${entry%%\|*}"
93	+	local url="${entry##*\|}"
94	+
95	+	if [[ -f "$HOME/$f" ]]; then
96	+	cp "$HOME/$f" "$backup/"
97	+	fi
98	+	log "Fetching $f ..."
99	+	curl -fsSL "$url" -o "$HOME/$f" \|\| warn "Failed to download $f"
100	+	done
101	+	ok "Configs downloaded (Backup at $backup)"
102	+	}
103	+
104	+	update_zshrc() {
105	+	local zshrc="$HOME/.zshrc"
106	+	log "Updating .zshrc..."
107	+
108	+	if [[ ! -f "$zshrc" ]]; then
109	+	warn ".zshrc not found, creating new one..."
110	+	touch "$zshrc"
111	+	fi
112	+
113	+	# macOS BSD sed requires '-i ''' for in-place editing
114	+	grep -q 'ZSH_THEME="spaceship"' "$zshrc" \|\| sed -i '' 's/ZSH_THEME=".*"/ZSH_THEME="spaceship"/' "$zshrc"
115	+	grep -q 'zsh-autosuggestions' "$zshrc" \|\| sed -i '' 's/plugins=(/plugins=(zsh-autosuggestions /' "$zshrc"
116	+	grep -q 'zsh-syntax-highlighting' "$zshrc" \|\| sed -i '' 's/plugins=(/plugins=(zsh-syntax-highlighting /' "$zshrc"
117	+	ok ".zshrc updated with plugins and theme"
118	+	}
119	+
120	+	switch_shell() {
121	+	log "Starting Zsh session..."
122	+	echo -e "${YELLOW}Type 'exit' to return to this installer menu.${NC}"
123	+	echo "----------------------------------------"
124	+	zsh -l
125	+	echo "----------------------------------------"
126	+	ok "Returned from Zsh session"
127	+	}
128	+
129	+	# =============================
130	+	# INTERACTIVE MENU
131	+	# =============================
132	+	show_menu() {
133	+	echo "==========================================="
134	+	echo "macOS Zsh Setup - Choose what to do"
135	+	echo "==========================================="
136	+	echo " 0) Run ALL steps (1-7)"
137	+	echo " 1) Configure Git"
138	+	echo " 2) Install Oh My Zsh"
139	+	echo " 3) Install plugins (autosuggestions, syntax highlighting)"
140	+	echo " 4) Install Spaceship theme"
141	+	echo " 5) Download custom configs (~/.alias, .vimrc, etc.)"
142	+	echo " 6) Update ~/.zshrc for plugins & theme"
143	+	echo " 7) Switch to Zsh (Temporary Sub-shell)"
144	+	echo " 8) Quit"
145	+	echo "==========================================="
146	+	echo "Inputs: '0' (All), '1 3 4' (Specific), '0 !1 !5' (All except 1 and 5)"
147	+	}
148	+
149	+	run_choices() {
150	+	local input
151	+	read -p "Select: " input
152	+	input="${input//,/ }" # replace commas with spaces if used
153	+
154	+	local -a to_run=()
155	+	local -a to_exclude=()
156	+
157	+	# Parse positive selections and negative exclusions
158	+	for item in $input; do
159	+	if [[ "$item" == !* ]]; then
160	+	to_exclude+=("${item:1}") # Strip the '!' character
161	+	elif [[ "$item" == "0" ]]; then
162	+	to_run+=(1 2 3 4 5 6 7)
163	+	else
164	+	to_run+=("$item")
165	+	fi
166	+	done
167	+
168	+	# Loop through the intended runs and apply the exclusions
169	+	for choice in "${to_run[@]}"; do
170	+
171	+	# Check if the current choice is in the exclusion array
172	+	local skip=false
173	+	for ex in "${to_exclude[@]}"; do
174	+	if [[ "$choice" == "$ex" ]]; then
175	+	skip=true
176	+	break
177	+	fi
178	+	done
179	+
180	+	# If skip is true, jump to the next iteration of the loop without doing anything
181	+	$skip && continue
182	+
183	+	case "$choice" in
184	+	1) configure_git ;;
185	+	2) install_oh_my_zsh ;;
186	+	3) install_plugins ;;
187	+	4) install_theme ;;
188	+	5) download_configs ;;
189	+	6) update_zshrc ;;
190	+	7) switch_shell ;;
191	+	8) log "Exiting..."; exit 0 ;;
192	+	*) warn "Skipping invalid option: $choice" ;;
193	+	esac
194	+	echo
195	+	done
196	+	}
197	+
198	+	# =============================
199	+	# MAIN
200	+	# =============================
201	+	main() {
202	+	check_requirements
203	+	while true; do
204	+	show_menu
205	+	run_choices
206	+	read -p "Do you want to run more options? (y/n): " again
207	+	[[ "$again" =~ ^[Yy]$ ]] \|\| break
208	+	done
209	+	ok "macOS configuration complete!"
210	+	}
211	+
212	+	main "$@"

zsh.sh renamed to zsh_ubuntu.sh

			@@ -21,8 +21,6 @@ err() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
21	21		SKIP_PACKAGES=false
22	22		SKIP_GIT_CONFIG=false
23	23		SKIP_SHELL_CHANGE=false
24		-	# This flag is for non-interactive mode.
25		-	# Interactive menu options will override this.
26	24		CUSTOM_CONFIG=false
27	25		SKIP_XCLIP=false
28	26		INSTALL_HOMEBREW=false
			@@ -52,8 +50,15 @@ detect_os() {
52	50		# REQUIREMENTS
53	51		# =============================
54	52		check_requirements() {
55		-	[[ $EUID -eq 0 ]] && err "Do not run as root" && exit 1
56		-	command -v sudo >/dev/null \|\| { err "sudo required"; exit 1; }
	53	+	# Fixed to prevent silent failure with 'set -e'
	54	+	if [[ $EUID -eq 0 ]]; then
	55	+	err "Do not run as root"
	56	+	exit 1
	57	+	fi
	58	+	if ! command -v sudo >/dev/null; then
	59	+	err "sudo required"
	60	+	exit 1
	61	+	fi
57	62		}
58	63
59	64		# =============================
			@@ -150,7 +155,6 @@ install_theme() {
150	155		}
151	156
152	157		download_configs() {
153		-	# Guard clause removed so menu selection works
154	158		log "Downloading custom config files..."
155	159		local backup="$HOME/.config_backup_$(date +%Y%m%d_%H%M%S)"
156	160		mkdir -p "$backup"
			@@ -202,6 +206,7 @@ show_menu() {
202	206		echo "==========================================="
203	207		echo "Zsh Installer - Choose what to do"
204	208		echo "==========================================="
	209	+	echo " 0) Run ALL steps (1-13)"
205	210		echo " 1) Update system packages"
206	211		echo " 2) Install core packages (zsh, git, vim, etc.)"
207	212		echo " 3) Set Timezone (Asia/Singapore)"
			@@ -217,7 +222,7 @@ show_menu() {
217	222		echo "13) Switch to Zsh (Temporary Sub-shell)"
218	223		echo "14) Quit"
219	224		echo "==========================================="
220		-	echo "You can enter multiple numbers at once (e.g., 2,3,7,8)"
	225	+	echo "Inputs: '0' (All), '2 3 7' (Specific), '0 !4 !6' (All except 4 and 6)"
221	226		}
222	227
223	228		run_choices() {
			@@ -225,7 +230,33 @@ run_choices() {
225	230		read -p "Select: " input
226	231		input="${input//,/ }" # replace commas with spaces
227	232
228		-	for choice in $input; do
	233	+	local -a to_run=()
	234	+	local -a to_exclude=()
	235	+
	236	+	# Parse positive selections and negative exclusions
	237	+	for item in $input; do
	238	+	if [[ "$item" == !* ]]; then
	239	+	to_exclude+=("${item:1}") # Strip the '!' character
	240	+	elif [[ "$item" == "0" ]]; then
	241	+	to_run+=(1 2 3 4 5 6 7 8 9 10 11 12 13)
	242	+	else
	243	+	to_run+=("$item")
	244	+	fi
	245	+	done
	246	+
	247	+	# Loop through intended runs and apply exclusions
	248	+	for choice in "${to_run[@]}"; do
	249	+
	250	+	local skip=false
	251	+	for ex in "${to_exclude[@]}"; do
	252	+	if [[ "$choice" == "$ex" ]]; then
	253	+	skip=true
	254	+	break
	255	+	fi
	256	+	done
	257	+
	258	+	$skip && continue
	259	+
229	260		case "$choice" in
230	261		1) update_system ;;
231	262		2) install_packages ;;

Newer Older