mirror of
https://github.com/wting/autojump
synced 2024-10-27 20:34:07 +00:00
Merge branch 'master' of https://github.com/joelthelion/autojump
This commit is contained in:
commit
45ca3fd10f
@ -119,7 +119,7 @@ For now gcarrier and I have packaged autojump for Arch Linux. It is available in
|
|||||||
|
|
||||||
pacman -S autojump
|
pacman -S autojump
|
||||||
|
|
||||||
Tanguy Ortolo packaged autojump for Debian testing/unstable. It will eventually reach Ubuntu. To install, type::
|
Autojump is now officially a part of Debian Sid, thanks to Tanguy Ortolo’s work (for policy reasons, it requires manual activation after installing, see /usr/share/doc/autojump/README.Debian). To install, type::
|
||||||
|
|
||||||
apt-get install autojump
|
apt-get install autojump
|
||||||
|
|
||||||
@ -127,7 +127,7 @@ Autojump is also available on the OSX Homebrew package manager::
|
|||||||
|
|
||||||
brew install autojump
|
brew install autojump
|
||||||
|
|
||||||
I would be very interested by packages for other distros. If you think you can help me with the packaging, please contact me!
|
Autojump is also packaged for a number of other distros. Check the wiki for an up-to-date list! I would be very interested by packages for other distros. If you think you can help with the packaging, please contact me!
|
||||||
|
|
||||||
Uninstallation
|
Uninstallation
|
||||||
==============
|
==============
|
||||||
|
2
autojump
2
autojump
@ -28,7 +28,7 @@ from operator import itemgetter
|
|||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
AUTOJUMP_VERSION = "release v17"
|
AUTOJUMP_VERSION = "release-v18"
|
||||||
MAX_KEYWEIGHT = 1000
|
MAX_KEYWEIGHT = 1000
|
||||||
MAX_STORED_PATHS = 600
|
MAX_STORED_PATHS = 600
|
||||||
COMPLETION_SEPARATOR = '__'
|
COMPLETION_SEPARATOR = '__'
|
||||||
|
@ -29,6 +29,26 @@ EOF
|
|||||||
}
|
}
|
||||||
complete -F _autojump j
|
complete -F _autojump j
|
||||||
|
|
||||||
|
_autojump_files()
|
||||||
|
{
|
||||||
|
if [[ ${COMP_WORDS[COMP_CWORD]} == *__* ]]
|
||||||
|
then
|
||||||
|
local cur
|
||||||
|
#cur=${COMP_WORDS[*]:1}
|
||||||
|
cur=${COMP_WORDS[COMP_CWORD]}
|
||||||
|
comps=$(autojump --bash --completion $cur)
|
||||||
|
while read i
|
||||||
|
do
|
||||||
|
#COMPREPLY=("${COMPREPLY[@]}" "${COMP_WORDS[@]:1:$(( ${#COMP_WORDS[@]} - 1 ))}${i}")
|
||||||
|
COMPREPLY=("${COMPREPLY[@]}" "${i}")
|
||||||
|
done <<EOF
|
||||||
|
$comps
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
complete -o default -o bashdefault -F _autojump_files cp
|
||||||
|
complete -o default -o bashdefault -F _autojump_files mv
|
||||||
|
|
||||||
#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
|
||||||
|
@ -7,8 +7,14 @@ then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$1" ]
|
||||||
|
then
|
||||||
gitrevision=`git describe`
|
gitrevision=`git describe`
|
||||||
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
|
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
|
||||||
gitrevision=$gitrevision"-dirty"
|
gitrevision=$gitrevision"-dirty"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
gitrevision="$1"
|
||||||
|
fi
|
||||||
|
|
||||||
sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump
|
sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump
|
||||||
|
@ -8,9 +8,14 @@ then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
version=$1
|
version=$1
|
||||||
|
tagname=release-${version}
|
||||||
|
./git-version.sh ${tagname}
|
||||||
|
|
||||||
|
# Commit the version change
|
||||||
|
git commit -m "version numbering" autojump
|
||||||
|
|
||||||
#Create tag
|
#Create tag
|
||||||
git tag -a release-${version}
|
git tag -a ${tagname}
|
||||||
|
|
||||||
#check for tag existence
|
#check for tag existence
|
||||||
git describe release-$1 2>&1 >/dev/null ||
|
git describe release-$1 2>&1 >/dev/null ||
|
||||||
@ -19,5 +24,4 @@ git describe release-$1 2>&1 >/dev/null ||
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
./git-version.sh
|
git archive --format=tar --prefix autojump_${version}/ ${tagname} | gzip > autojump_${version}.tar.gz
|
||||||
git archive --format=tar --prefix autojump_${version}/ release-${version} | gzip > autojump_${version}.tar.gz
|
|
||||||
|
Loading…
Reference in New Issue
Block a user