rework config pathes

This commit is contained in:
accel 2021-12-20 17:39:03 +03:00
parent 8e418f681a
commit 7b95808f19

View File

@ -120,14 +120,14 @@ function zconfigs_load()
function zconfigs_local_load() function zconfigs_local_load()
{ {
if [[ ! -a ${HOME}/.config/zsh ]]; then if [[ ! -a ${zconfig_local_path} ]]; then
mkdir -p -m 700 ${HOME}/.config/zsh mkdir -p -m 700 ${zconfig_local_path}
cp ${globaldots_path}/config/zsh/zshconfig.example ${HOME}/.config/zsh/local.config.zsh cp ${globaldots_path}/config/zsh/zshconfig.example ${zconfig_local_path}/local.config.zsh
fi fi
if [[ ! -d ${HOME}/.config/zsh ]]; then if [[ ! -d ${zconfig_local_path} ]]; then
zconfig_checkload ${HOME}/.config/zsh zconfig_checkload ${zconfig_local_path}
else else
zconfigs_load ${HOME}/.config/zsh/*.config.zsh; zconfigs_load ${zconfig_local_path}/*.config.zsh;
fi fi
} }
@ -159,12 +159,12 @@ function zshlibs_boot()
function zbootstrap_noninteractive() function zbootstrap_noninteractive()
{ {
zbootstrap_message zbootstrap 'load global config' zbootstrap_message zbootstrap 'load global config'
zconfig_checkload ${globaldots_path}/config/zsh/global.config.zsh zconfig_checkload ${zconfig_shared_path}/global.config.zsh
zbootstrap_message zbootstrap 'load local configs' zbootstrap_message zbootstrap 'load local configs'
zconfigs_local_load zconfigs_local_load
for zconfig in $config_extra; do for zconfig in $config_extra; do
zbootstrap_message zbootstrap 'load config extra $zconfig' zbootstrap_message zbootstrap 'load config extra $zconfig'
zconfig_checkload ${globaldots_path}/config/zsh/${zconfig}.config.zsh zconfig_checkload ${zconfig_shared_path}/${zconfig}.config.zsh
done done
# expanding settings # expanding settings
zbootstrap_message zbootstrap "expanding path with '$path_extra'" zbootstrap_message zbootstrap "expanding path with '$path_extra'"