Merge branch 'master' of https://github.com/joelthelion/autojump

autojump

@@ -28,7 +28,7 @@ from operator import itemgetter
 import os
 import shutil
 
-AUTOJUMP_VERSION = "release-v18"
+AUTOJUMP_VERSION = "release-v19"
 MAX_KEYWEIGHT = 1000
 MAX_STORED_PATHS = 600
 COMPLETION_SEPARATOR = '__'

autojump.bash

@@ -39,15 +39,13 @@ _autojump_files()
         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
+complete -o default -o bashdefault -F _autojump_files cp mv meld diff kdiff3
 
 #determine the data directory according to the XDG Base Directory Specification
 if [ -n "$XDG_DATA_HOME" ]

install.sh

@@ -33,8 +33,14 @@ prefix=/usr
 profile_d=/etc/profile.d
 
 user=${SUDO_USER:-${USER}}
-user_home=$(getent passwd ${user} | cut -d: -f6)
-bashrc_file=${user_home}/.bashrc
+OS=`uname`
+
+if [ $OS == 'Darwin' ]; then
+    user_home=$(dscl . -search /Users UniqueID ${user} | cut -d: -f6)
+else
+    user_home=$(getent passwd ${user} | cut -d: -f6)
+fi
+    bashrc_file=${user_home}/.bashrc
 
 # Command line parsing
 while true; do
@@ -103,7 +109,6 @@ else
                 # Since OSX uses .bash_profile, we need to make sure that .bashrc is properly sourced.
                 # Makes the assumption that if they have a line: source ~/.bashrc or . ~/.bashrc, that
                 # .bashrc has been properly sourced and you don't need to add it.
-                OS=`uname`
                 if [ $OS == 'Darwin' -a x`grep -c "^[[:space:]]*\(source\|\.\) ~/\.bashrc[[:space:]]*$" ~/.bash_profile` == x0 ]; then
                     echo "You are using OSX and your .bash_profile doesn't seem to be sourcing .bashrc"
                     echo "Adding source ~/.bashrc to your bashrc"