Merge pull request #94 from wting/zsh-install-refactor

zsh install: only one line needs to be added to .zshrc now

autojump.zsh

@@ -14,22 +14,26 @@
 #You should have received a copy of the GNU General Public License
 #along with autojump.  If not, see <http://www.gnu.org/licenses/>.
 
-#determine the data directory according to the XDG Base Directory Specification
-if [ -n "$XDG_DATA_HOME" ]
-then
+# determine the data directory according to the XDG Base Directory Specification
+if [ -n "$XDG_DATA_HOME" ]; then
     export AUTOJUMP_DATA_DIR="$XDG_DATA_HOME/autojump"
 else
     export AUTOJUMP_DATA_DIR=~/.local/share/autojump
 fi
 
-if [ ! -e "${AUTOJUMP_DATA_DIR}" ]
-then
+if [ ! -e "${AUTOJUMP_DATA_DIR}" ]; then
     mkdir -p "${AUTOJUMP_DATA_DIR}"
     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_errors "${AUTOJUMP_DATA_DIR}/autojump_errors" 2>>/dev/null
 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() {
     { (autojump -a "$(pwd -P)"&)>/dev/null 2>>|${AUTOJUMP_DATA_DIR}/.autojump_errors ; } 2>/dev/null
 }

install.zsh

@@ -99,6 +99,12 @@ if ( ! ${local} ); then
         echo -e "\tsource /etc/profile.d/autojump.zsh"
         echo
         echo "You need to source your ~/.zshrc (source ~/.zshrc) before you can start using autojump."
+        echo
+        if [[ ${prefix} != "/usr" ]]; then
+            echo "To remove autojump, run ./uninstall.zsh --prefix ${prefix}"
+        else
+            echo "To remove autojump, run ./uninstall.zsh"
+        fi
     else
         echo "Your distribution does not have a /etc/profile.d directory, the default that we install one of the scripts to. Would you like us to copy it into your ~/.zshrc file to make it work? (If you have done this once before, delete the old version before doing it again.) [y/n]"
         read ans
@@ -128,11 +134,9 @@ else
     echo
     echo "Add the following lines to your ~/.zshrc:"
     echo
-	echo -e "\tpath=(${prefix}/bin \${path})"
-	echo -e "\tfpath=(${prefix}/functions \${fpath})"
     echo -e "\tsource ${prefix}/etc/profile.d/autojump.zsh"
     echo
     echo "You need to source your ~/.zshrc (source ~/.zshrc) before you can start using autojump."
     echo
-	echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.zshrc."
+    echo "To remove autojump, run ./uninstall.zsh"
 fi