Title: Update zrep script with downloader choice validation
- Fixed downloader choice validation in zrep_init function - Moved zrep_fpath and autoload commands to else block for existing config handling
This commit is contained in:
parent
de3bb15662
commit
53bd010da6
9
zrep
9
zrep
@ -24,9 +24,6 @@ function zrep_fpath() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
zrep_fpath ${HOME}/.zrep/functions
|
|
||||||
autoload -Uz zini
|
|
||||||
|
|
||||||
# Define a list of colors available to use in themes
|
# Define a list of colors available to use in themes
|
||||||
typeset -A base_colors=(
|
typeset -A base_colors=(
|
||||||
[green]="\033[0;32m"
|
[green]="\033[0;32m"
|
||||||
@ -156,10 +153,10 @@ function zrep_init() {
|
|||||||
read "install_dir?Enter zrep installation directory [${HOME}/.zrep]: "
|
read "install_dir?Enter zrep installation directory [${HOME}/.zrep]: "
|
||||||
install_dir=${install_dir:-"${HOME}/.zrep"}
|
install_dir=${install_dir:-"${HOME}/.zrep"}
|
||||||
read "downloader?Choose command to download packages [curl, wget, wget2]: "
|
read "downloader?Choose command to download packages [curl, wget, wget2]: "
|
||||||
if [[ ${downloader} != "curl" || ${downloader} != "wget" || ${downloader} != "wget2" ]]; then
|
if [[ ${downloader} != curl || ${downloader} != wget || ${downloader} != wget2 ]]; then
|
||||||
echo "Invalid choice: '$downloader'. Try again."
|
echo "Invalid choice: '$downloader'. Try again."
|
||||||
read "downloader?Choose command to download packages [curl, wget, wget2] "
|
read "downloader?Choose command to download packages [curl, wget, wget2] "
|
||||||
if [[ ${downloader} != "curl" || ${downloader} != "wget" || ${downloader} != "wget2" ]]; then
|
if [[ ${downloader} != curl || ${downloader} != wget || ${downloader} != wget2 ]]; then
|
||||||
echo "Invalid choice: '$downloader'. Exiting."
|
echo "Invalid choice: '$downloader'. Exiting."
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
@ -177,6 +174,8 @@ downloader = ${downloader}
|
|||||||
EOF
|
EOF
|
||||||
echo "The file '${ZREP_CONFIG}' has been created."
|
echo "The file '${ZREP_CONFIG}' has been created."
|
||||||
else
|
else
|
||||||
|
zrep_fpath ${HOME}/.zrep/functions
|
||||||
|
autoload -Uz zini
|
||||||
echo "Loading configuration from ${ZREP_CONFIG}"
|
echo "Loading configuration from ${ZREP_CONFIG}"
|
||||||
zini ${ZREP_CONFIG}
|
zini ${ZREP_CONFIG}
|
||||||
install_dir=${config[main_zrep_install_dir]}
|
install_dir=${config[main_zrep_install_dir]}
|
||||||
|
Loading…
Reference in New Issue
Block a user