Skip to content

Commit fa8f64b

Browse files
committed
fix(zsh):properly handle package manager
1 parent f093821 commit fa8f64b

File tree

1 file changed

+12
-35
lines changed

1 file changed

+12
-35
lines changed

Configs/.zshenv

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,13 @@ function command_not_found_handler {
1818
local purple='\e[1;35m' bright='\e[0;1m' green='\e[1;32m' reset='\e[0m'
1919
printf "${green}zsh${reset}: command ${purple}NOT${reset} found: ${bright}'%s'${reset}\n" "$1"
2020

21-
PM="pm.sh"
22-
# Try to find pm.sh in common locations
23-
if ! command -v "${PM}" &>/dev/null; then
24-
for path in "/usr/lib/hyde" "/usr/local/lib/hyde" "$HOME/.local/lib/hyde" "$HOME/.local/bin"; do
25-
if [[ -x "$path/pm.sh" ]]; then
26-
PM="$path/pm.sh"
27-
break
28-
else
29-
unset PM
30-
fi
31-
done
32-
fi
33-
34-
if ! command -v "${PM}" &>/dev/null; then
35-
printf "${bright}${red}We cannot find package manager script (${purple}pm.sh${red}) from ${green}HyDE${reset}\n"
21+
if ! ${PM_COMMAND[@]} -h &>/dev/null; then
3622
return 127
3723
fi
3824

39-
printf "${bright}Searching for packages that provide '${bright}%s${green}'...${reset} " "$1"
25+
printf "${bright}Searching for packages that provide '${bright}%s${green}'...\n${reset}" "${1}"
4026

41-
if ! "${PM}" fq "/usr/bin/$1"; then
27+
if ! "${PM_COMMAND[@]}" fq "/usr/bin/$1"; then
4228
printf "${bright}${green}[ ${1} ]${reset} ${purple}NOT${reset} found in the system and no package provides it.\n"
4329
return 127
4430
else
@@ -138,18 +124,6 @@ function load_omz_on_init() {
138124
unset DEFER_OMZ_LOAD
139125
[[ -r $ZSH/oh-my-zsh.sh ]] && source $ZSH/oh-my-zsh.sh
140126

141-
# Load my package manager
142-
#? This is a custom package manager for HyDE
143-
PM="pm.sh"
144-
# Try to find pm.sh in common locations
145-
if ! command -v "${PM}" &>/dev/null; then
146-
for path in "/usr/lib/hyde" "/usr/local/lib/hyde" "$HOME/.local/lib/hyde" "$HOME/.local/bin"; do
147-
if [[ -x "$path/pm.sh" ]]; then
148-
PM="$path/pm.sh"
149-
break
150-
fi
151-
done
152-
fi
153127
load_persistent_aliases
154128
fi
155129
}
@@ -197,17 +171,17 @@ function load_if_terminal {
197171
# TODO: add handlers in pm.sh
198172
# for these aliases please manually add the following lines to your .zshrc file.(Using yay as the aur helper)
199173
# pc='yay -Sc' # remove all cached packages
200-
# po='yay -Qtdq | $PM -Rns -' # remove orphaned packages
174+
# po='yay -Qtdq | ${PM_COMMAND[@]} -Rns -' # remove orphaned packages
201175

202176
# Warn if the shell is slow to load
203177
add-zsh-hook -Uz precmd slow_load_warning
204178

205179
alias c='clear' \
206-
in='$PM install' \
207-
un='$PM remove' \
208-
up='$PM upgrade' \
209-
pl='$PM search installed' \
210-
pa='$PM search all' \
180+
in='${PM_COMMAND[@]} install' \
181+
un='${PM_COMMAND[@]} remove' \
182+
up='${PM_COMMAND[@]} upgrade' \
183+
pl='${PM_COMMAND[@]} search installed' \
184+
pa='${PM_COMMAND[@]} search all' \
211185
vc='code' \
212186
fastfetch='fastfetch --logo-type kitty' \
213187
..='cd ..' \
@@ -247,6 +221,9 @@ SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
247221
ZSH_AUTOSUGGEST_STRATEGY=(history completion)
248222
HISTFILE=${HISTFILE:-$HOME/.zsh_history}
249223

224+
# HyDE Package Manager
225+
PM_COMMAND=(hyde-shell pm)
226+
250227
export XDG_CONFIG_HOME XDG_CONFIG_DIR XDG_DATA_HOME XDG_STATE_HOME \
251228
XDG_CACHE_HOME XDG_DESKTOP_DIR XDG_DOWNLOAD_DIR \
252229
XDG_TEMPLATES_DIR XDG_PUBLICSHARE_DIR XDG_DOCUMENTS_DIR \

0 commit comments

Comments
 (0)