diff --git a/src/defs/usage.zsh b/src/defs/usage.zsh index 9bc4bc7..ab14c76 100755 --- a/src/defs/usage.zsh +++ b/src/defs/usage.zsh @@ -10,7 +10,7 @@ usage() { active_tools=() deprecated_tools_found=() - for tool in ${(f)all_tools}; do + while IFS= read -r tool; do local is_deprecated=false for d in "${DEPRECATED_TOOLS[@]}"; do [[ "$tool" == "$d" ]] && is_deprecated=true && break @@ -20,7 +20,7 @@ usage() { else active_tools+=("$tool") fi - done + done <<<"$all_tools" modes_str=$(array_str ", " "${modes[@]}") profiles_str=$(array_str "/" "${profiles[@]}") diff --git a/src/installers/asdf.configure.zsh b/src/installers/asdf.configure.zsh index 6801125..8b8f548 100644 --- a/src/installers/asdf.configure.zsh +++ b/src/installers/asdf.configure.zsh @@ -8,4 +8,3 @@ export ASDF_DIR="$CLI_CONFIG_ROOT/current/asdf" export ASDF_DATA_DIR="$CLI_CONFIG_ROOT/current/asdf" export PATH="$ASDF_DIR/bin:$PATH" EOF - diff --git a/src/installers/nvm.configure.zsh b/src/installers/nvm.configure.zsh index b9e7d0e..acc721d 100755 --- a/src/installers/nvm.configure.zsh +++ b/src/installers/nvm.configure.zsh @@ -7,4 +7,3 @@ printf "# add nvm to path\n" >>$CONF printf 'export PATH="$NVM_DIR:$PATH"\n' >>$CONF # printf 'lazyload nvm node npm -- "source $NVM_DIR/nvm.sh"' >>$CONF # turn off lazyload until I figure out how to let it work with AI agents - diff --git a/src/scripts/setup.programs-conf.zsh b/src/scripts/setup.programs-conf.zsh index 4b5d546..a5a5af9 100755 --- a/src/scripts/setup.programs-conf.zsh +++ b/src/scripts/setup.programs-conf.zsh @@ -1,19 +1,18 @@ # generate main config script Log "Generating programs configuration" -printf "# [Autogenerated - do not edit: at $(date)] CLI-Config Install configuration --------" > $CLI_CONFIG_PROGRAMS_CONF -echo >> $CLI_CONFIG_PROGRAMS_CONF +printf "# [Autogenerated - do not edit: at $(date)] CLI-Config Install configuration --------" >$CLI_CONFIG_PROGRAMS_CONF +echo >>$CLI_CONFIG_PROGRAMS_CONF -echo '# init all cli-config tools' >> $CLI_CONFIG_PROGRAMS_CONF -echo 'autoload -Uz compinit && compinit' >> $CLI_CONFIG_PROGRAMS_CONF +echo '# init all cli-config tools' >>$CLI_CONFIG_PROGRAMS_CONF +echo 'autoload -Uz compinit && compinit' >>$CLI_CONFIG_PROGRAMS_CONF # plugin manager must be sourced first so lazyload is available to other confs PLUGIN_MANAGER="${CLI_CONFIG_MODULES:-zimfw}" PLUGIN_MANAGER_CONF=$(find $CLI_CONFIG_CONF_LOCATION -type f -name "${PLUGIN_MANAGER}.conf.*" | head -1) -[[ -n "$PLUGIN_MANAGER_CONF" ]] && echo ". $PLUGIN_MANAGER_CONF" >> $CLI_CONFIG_PROGRAMS_CONF +[[ -n "$PLUGIN_MANAGER_CONF" ]] && echo ". $PLUGIN_MANAGER_CONF" >>$CLI_CONFIG_PROGRAMS_CONF -for tool in $(find $CLI_CONFIG_CONF_LOCATION -type f \( -name '*.conf.sh' -o -name '*.conf.zsh' \) -not -name "${PLUGIN_MANAGER}.conf.*" | sort); do - echo ". $tool" >> $CLI_CONFIG_PROGRAMS_CONF +for tool in $(find $CLI_CONFIG_CONF_LOCATION -type f \( -name '*.conf.sh' -o -name '*.conf.zsh' \) -not -name "${PLUGIN_MANAGER}.conf.*" | sort); do + echo ". $tool" >>$CLI_CONFIG_PROGRAMS_CONF done -echo eval "\$(thefuck --alias)" >> $CLI_CONFIG_PROGRAMS_CONF - +echo eval "\$(thefuck --alias)" >>$CLI_CONFIG_PROGRAMS_CONF diff --git a/src/utils/tool-guards.zsh b/src/utils/tool-guards.zsh index 3230723..364006e 100644 --- a/src/utils/tool-guards.zsh +++ b/src/utils/tool-guards.zsh @@ -21,13 +21,15 @@ validate_tools() { # count how many plugin managers were requested for pm in "${PLUGIN_MANAGERS[@]}"; do if [[ "$tool" == "$pm" ]]; then - (( plugin_manager_count++ )) + ((plugin_manager_count++)) fi done done - if (( plugin_manager_count > 1 )); then - echo "[cli-config] Error: only one plugin manager can be specified (${(j:, :)PLUGIN_MANAGERS}). Got $plugin_manager_count." + if ((plugin_manager_count > 1)); then + pm_list=$(printf '%s, ' "${PLUGIN_MANAGERS[@]}") + pm_list=${pm_list%, } + echo "[cli-config] Error: only one plugin manager can be specified ($pm_list). Got $plugin_manager_count." exit 1 fi }