Selaa lähdekoodia

remove _j() as it was never used to begin with.

pull/180/head
William Ting 11 vuotta sitten
vanhempi
commit
49a0d702ba
5 muutettua tiedostoa jossa 2 lisäystä ja 50 poistoa
  1. +0
    -6
      bin/_j
  2. +1
    -1
      bin/autojump
  3. +0
    -2
      bin/autojump.zsh
  4. +1
    -34
      install.sh
  5. +0
    -7
      uninstall.sh

+ 0
- 6
bin/_j Näytä tiedosto

@ -1,6 +0,0 @@
#compdef j
cur=${words[2, -1]}
autojump --complete ${=cur[*]} | while read i; do
compadd -U "$i";
done

+ 1
- 1
bin/autojump Näytä tiedosto

@ -34,7 +34,7 @@ import re
import shutil
from tempfile import NamedTemporaryFile
VERSION = 'release-v21.4.0'
VERSION = 'release-v21.4.1'
MAX_KEYWEIGHT = 1000
MAX_STORED_PATHS = 1000
COMPLETION_SEPARATOR = '__'

+ 0
- 2
bin/autojump.zsh Näytä tiedosto

@ -38,7 +38,6 @@ preexec_functions+=autojump_preexec
function j {
# Cannot use =~ due to MacPorts zsh v4.2, see issue #125.
echo "j()"
if [[ ${@} == -* ]]; then
autojump ${@}
return
@ -56,7 +55,6 @@ function j {
}
function jc {
echo "j()"
if [[ ${@} == -* ]]; then
j ${@}
else

+ 1
- 34
install.sh Näytä tiedosto

@ -3,13 +3,12 @@
function help_msg {
echo "./install.sh [OPTION..]"
echo
echo " -a, --auto Try to determine destdir, prefix (and zshshare if applicable)"
echo " -a, --auto Try to determine destdir, prefix"
echo " -g, --global Use default global settings (destdir=/; prefix=usr)"
echo " -l, --local Use default local settings (destdir=~/.autojump)"
echo
echo " -d, --destdir PATH Set install destination to PATH"
echo " -p, --prefix PATH Use PATH as prefix"
echo " -Z, --zshshare PATH Use PATH as zsh share destination"
echo
echo " -f, --force Ignore Python version check"
echo " -n, --dry_run Only show installation paths, don't install anything"
@ -20,11 +19,6 @@ function help_msg {
echo ' Documentation: $destdir$prefix/share/man/man1'
echo ' Icon: $destdir$prefix/share/autojump'
echo ' Shell scripts: $destdir/etc/profile.d'
echo ' zsh functions: $destdir$zshsharedir'
echo
echo 'Unless specified, $zshshare will be :'
echo ' - $destdir$prefix/functions for local installations'
echo ' - $destdir$prefix/share/zsh/site-functions for all other installations'
}
dry_run=
@ -34,7 +28,6 @@ force=
shell=`echo ${SHELL} | awk -F/ '{ print $NF }'`
destdir=
prefix="usr/local"
zshsharedir=
# If no arguments passed, default to --auto.
if [[ ${#} == 0 ]]; then
@ -98,14 +91,6 @@ while true; do
exit 1
fi
;;
-Z|--zshshare)
if [ $# -gt 1 ]; then
zshsharedir=$2; shift 2
else
echo "--zshshare or -Z requires an argument" 1>&2
exit 1
fi
;;
--)
shift
break
@ -152,18 +137,6 @@ if [[ ${shell} != "bash" ]] && [[ ${shell} != "zsh" ]]; then
exit 1
fi
# zsh functions
if [[ $shell == "zsh" ]]; then
if [[ -z $zshsharedir ]]; then
# if not set, use a default
if [[ $local ]]; then
zshsharedir="${prefix}functions"
else
zshsharedir="${prefix}share/zsh/site-functions"
fi
fi
fi
# check Python version
if [ ! ${force} ]; then
python_version=`python -c 'import sys; print(sys.version_info[:])'`
@ -194,9 +167,6 @@ echo "Binary: ${destdir}${prefix}bin/"
echo "Documentation: ${destdir}${prefix}share/man/man1/"
echo "Icon: ${destdir}${prefix}share/autojump/"
echo "Shell scripts: ${destdir}etc/profile.d/"
if [[ -z $shell ]] || [[ $shell == "zsh" ]]; then
echo "zsh functions: ${destdir}${zshsharedir}"
fi
echo
if [[ $dry_run ]]; then
@ -216,9 +186,6 @@ mkdir -p ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.sh ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.bash ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.zsh ${destdir}etc/profile.d/ || exit 1
mkdir -p ${destdir}${zshsharedir} || exit 1
# TODO: remove unused _j function (2013.02.01_1348, ting)
install -v -m 0755 ./bin/_j ${destdir}${zshsharedir} || exit 1
# MODIFY AUTOJUMP.SH FOR CUSTOM INSTALLS
if [[ -z ${local} ]] && [[ -z ${global} ]]; then

+ 0
- 7
uninstall.sh Näytä tiedosto

@ -65,14 +65,7 @@ if [ -d "${prefix}/share/autojump/" ]; then
if [ -f /etc/profile.d/autojump.zsh ]; then
sudo rm -v /etc/profile.d/autojump.zsh
fpath=`/usr/bin/env zsh -c 'echo $fpath'`
for f in ${fpath}; do
if [[ -f ${f}/_j ]]; then
sudo rm -v ${f}/_j
fi
done
remove_msg "global" "zsh"
fi
fi

Ladataan…
Peruuta
Tallenna