Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

fix bash local installation paths

Browse Source
This commit is contained in:
William Ting 2012-02-08 11:27:43 -10:00
parent fe548ef486
commit 5213506d3c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autojump.bash
View File

@ -15,7 +15,7 @@
#along with autojump. If not, see <http://www.gnu.org/licenses/>. #along with autojump. If not, see <http://www.gnu.org/licenses/>.
#This shell snippet sets the prompt command and the necessary aliases #This shell snippet sets the prompt command and the necessary aliases
_autojump() _autojump()
{ {
local cur local cur
cur=${COMP_WORDS[*]:1} cur=${COMP_WORDS[*]:1}
@ -29,10 +29,9 @@ EOF
} }
complete -F _autojump j complete -F _autojump j
_autojump_files() _autojump_files()
{ {
if [[ ${COMP_WORDS[COMP_CWORD]} == *__* ]] if [[ ${COMP_WORDS[COMP_CWORD]} == *__* ]]; then
then
local cur local cur
#cur=${COMP_WORDS[*]:1} #cur=${COMP_WORDS[*]:1}
cur=${COMP_WORDS[COMP_CWORD]} cur=${COMP_WORDS[COMP_CWORD]}
@ -48,21 +47,24 @@ EOF
complete -o default -o bashdefault -F _autojump_files cp mv meld diff kdiff3 complete -o default -o bashdefault -F _autojump_files cp mv meld diff kdiff3
#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
export PATH=~/.autojump/bin:"${PATH}"
fi
export AUTOJUMP_HOME=${HOME} export AUTOJUMP_HOME=${HOME}
AUTOJUMP='{ [[ "$AUTOJUMP_HOME" == "$HOME" ]] && (autojump -a "$(pwd -P)"&)>/dev/null 2>>"${AUTOJUMP_DATA_DIR}/.autojump_errors";} 2>/dev/null' AUTOJUMP='{ [[ "$AUTOJUMP_HOME" == "$HOME" ]] && (autojump -a "$(pwd -P)"&)>/dev/null 2>>"${AUTOJUMP_DATA_DIR}/.autojump_errors";} 2>/dev/null'

12
autojump.sh
View File

@ -15,7 +15,15 @@
#You should have received a copy of the GNU General Public License #You should have received a copy of the GNU General Public License
#along with autojump. If not, see <http://www.gnu.org/licenses/>. #along with autojump. If not, see <http://www.gnu.org/licenses/>.
if [ "$BASH_VERSION" ] && [ -n "$PS1" ] && echo $SHELLOPTS | grep -v posix >>/dev/null; then if [ "$BASH_VERSION" ] && [ -n "$PS1" ] && echo $SHELLOPTS | grep -v posix >>/dev/null; then
. /etc/profile.d/autojump.bash if [ -f ~/.autojump/etc/profile.d/autojump.bash ]; then
source ~/.autojump/etc/profile.d/autojump.bash
elif [ -f /etc/profile.d/autojump.bash ]; then
source /etc/profile.d/autojump.bash
fi
elif [ "$ZSH_VERSION" ] && [ -n "$PS1" ]; then elif [ "$ZSH_VERSION" ] && [ -n "$PS1" ]; then
. /etc/profile.d/autojump.zsh if [ -f ~/.autojump/etc/profile.d/autojump.zsh ]; then
source ~/.autojump/etc/profile.d/autojump.zsh
elif [ -f /etc/profile.d/autojump.zsh ]; then
source /etc/profile.d/autojump.zsh
fi
fi fi