1
0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00

refactor install.zsh so only one line needs to be added to .zshrc

This commit is contained in:
William Ting 2012-02-07 14:48:24 -10:00
parent d1712dd757
commit 2a364ae73e
2 changed files with 9 additions and 7 deletions

View File

@ -15,21 +15,25 @@
#along with autojump. If not, see <http://www.gnu.org/licenses/>. #along with autojump. If not, see <http://www.gnu.org/licenses/>.
# determine the data directory according to the XDG Base Directory Specification # determine the data directory according to the XDG Base Directory Specification
if [ -n "$XDG_DATA_HOME" ] if [ -n "$XDG_DATA_HOME" ]; then
then
export AUTOJUMP_DATA_DIR="$XDG_DATA_HOME/autojump" export AUTOJUMP_DATA_DIR="$XDG_DATA_HOME/autojump"
else else
export AUTOJUMP_DATA_DIR=~/.local/share/autojump export AUTOJUMP_DATA_DIR=~/.local/share/autojump
fi fi
if [ ! -e "${AUTOJUMP_DATA_DIR}" ] if [ ! -e "${AUTOJUMP_DATA_DIR}" ]; then
then
mkdir -p "${AUTOJUMP_DATA_DIR}" mkdir -p "${AUTOJUMP_DATA_DIR}"
mv ~/.autojump_py "${AUTOJUMP_DATA_DIR}/autojump_py" 2>>/dev/null #migration mv ~/.autojump_py "${AUTOJUMP_DATA_DIR}/autojump_py" 2>>/dev/null #migration
mv ~/.autojump_py.bak "${AUTOJUMP_DATA_DIR}/autojump_py.bak" 2>>/dev/null mv ~/.autojump_py.bak "${AUTOJUMP_DATA_DIR}/autojump_py.bak" 2>>/dev/null
mv ~/.autojump_errors "${AUTOJUMP_DATA_DIR}/autojump_errors" 2>>/dev/null mv ~/.autojump_errors "${AUTOJUMP_DATA_DIR}/autojump_errors" 2>>/dev/null
fi fi
# set paths if necessary for local installations
if [[ -d ~/.autojump/ ]]; then
path=(~/.autojump/bin $path)
fpath=(/home/ting/.autojump/functions/ $fpath)
fi
function autojump_preexec() { function autojump_preexec() {
{ (autojump -a "$(pwd -P)"&)>/dev/null 2>>|${AUTOJUMP_DATA_DIR}/.autojump_errors ; } 2>/dev/null { (autojump -a "$(pwd -P)"&)>/dev/null 2>>|${AUTOJUMP_DATA_DIR}/.autojump_errors ; } 2>/dev/null
} }

View File

@ -128,8 +128,6 @@ else
echo echo
echo "Add the following lines to your ~/.zshrc:" echo "Add the following lines to your ~/.zshrc:"
echo echo
echo -e "\tpath=(${prefix}/bin \${path})"
echo -e "\tfpath=(${prefix}/functions \${fpath})"
echo -e "\tsource ${prefix}/etc/profile.d/autojump.zsh" echo -e "\tsource ${prefix}/etc/profile.d/autojump.zsh"
echo echo
echo "You need to source your ~/.zshrc (source ~/.zshrc) before you can start using autojump." echo "You need to source your ~/.zshrc (source ~/.zshrc) before you can start using autojump."