From 49a0d702ba52640c11f7b54aea291a65b71beff7 Mon Sep 17 00:00:00 2001
From: William Ting <william.h.ting@gmail.com>
Date: Fri, 1 Feb 2013 14:00:50 -0600
Subject: [PATCH] remove _j() as it was never used to begin with.

---
 bin/_j           |  6 ------
 bin/autojump     |  2 +-
 bin/autojump.zsh |  2 --
 install.sh       | 35 +----------------------------------
 uninstall.sh     |  7 -------
 5 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 bin/_j

diff --git a/bin/_j b/bin/_j
deleted file mode 100644
index 6cbd600..0000000
--- a/bin/_j
+++ /dev/null
@@ -1,6 +0,0 @@
-#compdef j
-cur=${words[2, -1]}
-
-autojump --complete ${=cur[*]} | while read i; do
-    compadd -U "$i";
-done
diff --git a/bin/autojump b/bin/autojump
index 059eb6c..f3a9b22 100755
--- a/bin/autojump
+++ b/bin/autojump
@@ -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 = '__'
diff --git a/bin/autojump.zsh b/bin/autojump.zsh
index 4e28f9b..8694cb2 100644
--- a/bin/autojump.zsh
+++ b/bin/autojump.zsh
@@ -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
diff --git a/install.sh b/install.sh
index 498031c..584d53c 100755
--- a/install.sh
+++ b/install.sh
@@ -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
diff --git a/uninstall.sh b/uninstall.sh
index 4154984..f9e7788 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -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