More fixes to importing stuff - find will return full file paths.

This commit is contained in:
Stanislav Nikitin 2015-03-21 19:53:54 +05:00
parent eca7e5500a
commit 1babd0fb06
3 changed files with 7 additions and 7 deletions

View File

@ -6,5 +6,5 @@ if [ ! -d ${HOME}/.zsh-config.d/ ]; then
fi
for file in `find ${HOME}/.zsh-config.d/ -type f -depth 1 | sort`; do
source ${HOME}/.zsh-config.d/${file}
source ${file}
done

View File

@ -1,13 +1,13 @@
# Some default exports. They could be based on configuration variables.
for config_file in `find ${CONFIG_PATH}/zsh/exports -type f | sort`; do
source ${CONFIG_PATH}/zsh/exports/${config_file}
source ${config_file}
done
# We should import user-specific exports and use them.
if [ -d ${HOME}/.zsh-config.d/exports ]; then
for config_file in `find ${HOME}/.zsh-config.d/exports -type f | sort`; do
if [ -f ${HOME}/.zsh-config.d/exports/${config_file} ]; then
source ${HOME}/.zsh-config.d/exports/${config_file}
if [ -f ${config_file} ]; then
source ${config_file}
fi
done
fi

View File

@ -8,13 +8,13 @@ alias clocksync="sudo ntpdate 0.pool.ntp.org"
alias got="git"
for item in `find ${CONFIG_PATH}/zsh/aliases -type f | sort`; do
source ${CONFIG_PATH}/zsh/aliases/${item}
source ${item}
done
if [ -d "${HOME}/.zsh-config.d/aliases" ]; then
for item in `find ${HOME}/.zsh-config.d/aliases -type f | sort`; do
if [ -f ${HOME}/.zsh-config.d/aliases/${item} ]; then
source ${HOME}/.zsh-config.d/aliases/${item}
if [ -f ${item} ]; then
source ${item}
fi
done
fi