diff --git a/global.zsh b/global.zsh index 0719b7a..fa404d3 100644 --- a/global.zsh +++ b/global.zsh @@ -13,6 +13,6 @@ if [[ -z $globaldots_path ]]; then echo 'functions require $globaldots_path to be set!' fi -autoload global_path_expand global_fpath_expand global_set_useropts \ +autoload global_path_expand global_fpath_expand \ global_configure global_config_setup global_boot fpath+=(${zshlibs_install}/global) diff --git a/global/global_config_setup b/global/global_config_setup index 7ef4e62..5ccc9c9 100644 --- a/global/global_config_setup +++ b/global/global_config_setup @@ -1,7 +1,10 @@ function global_config_setup() { zshlibs_log global "expanding path with '$path_extra'" - global_path_expand $path_extra + if [[ -n "${extras_path}" ]] + then + global_path_expand $extras_path $path_extra + fi zshlibs_log global "expanding fpath with '$fpath_extra'" global_fpath_expand vanilla zshlibs_log global "done loading noninteractive config" diff --git a/global/global_configure b/global/global_configure index 5958280..3eeb16e 100644 --- a/global/global_configure +++ b/global/global_configure @@ -1,4 +1,4 @@ function global_configure() { - typeset -a -g path_extra + typeset -a -g extras_choices } diff --git a/global/global_path_expand b/global/global_path_expand index ce57a57..2737571 100644 --- a/global/global_path_expand +++ b/global/global_path_expand @@ -1,6 +1,7 @@ function global_path_expand() { - local bin_base=${globaldots_path}/bin + local bin_base=${1}/bin + shift for pathnew in ${*}; do zshlibs_path_add "${bin_base}/${pathnew}" done; diff --git a/global/global_set_useropts b/global/global_set_useropts deleted file mode 100644 index e2f99da..0000000 --- a/global/global_set_useropts +++ /dev/null @@ -1,4 +0,0 @@ -function global_set_useropts() -{ - typeset -a -g path_extra -} diff --git a/tools/zshlibs_path_add b/tools/zshlibs_path_add index a310628..ef506e2 100644 --- a/tools/zshlibs_path_add +++ b/tools/zshlibs_path_add @@ -7,4 +7,3 @@ function zshlibs_path_add() path+=(${pathtoadd}) fi } -