Merge 450787682f into 3c67f84437

README.rst

@@ -104,9 +104,9 @@ before the first step.
 
 Manual installation of autojump is very simple: copy
 
-- autojump to /usr/bin,
+- autojump to /usr/local/bin,
 - autojump.sh to /etc/profile.d,
-- autojump.1 to /usr/share/man/man1.
+- autojump.1 to /usr/local/share/man/man1.
 
 Make sure to source ``/etc/profile`` in your ``.bashrc`` or ``.zshrc`` ::
 
@@ -136,15 +136,15 @@ To completely remove autojump you should remove these files:
 
 ``/etc/profile.d/autojump.zsh``
 
-``/usr/bin/autojump``
+``/usr/local/bin/autojump``
 
-``/usr/bin/jumpapplet``
+``/usr/local/bin/jumpapplet``
 
-``/usr/share/autojump/icon.png``
+``/usr/local/share/autojump/icon.png``
 
-``/usr/share/autojump/``
+``/usr/local/share/autojump/``
 
-``/usr/share/man/man1/autojump.1``
+``/usr/local/share/man/man1/autojump.1``
 
 Remove any mention of autojump in your ``.bashrc`` or ``.zshrc``, then in currently running shells do:``source /etc/profile``.
 

autojump.bash

@@ -25,18 +25,11 @@ _autojump()
         done  < <(autojump --bash --completion $cur)
 }
 complete -F _autojump j
-#data_dir=${XDG_DATA_HOME:-$([ -e ~/.local/share ] && echo ~/.local/share || echo ~)}
-data_dir=$([ -e ~/.local/share ] && echo ~/.local/share || echo ~)
+
 export AUTOJUMP_HOME=${HOME}
-if [[ "$data_dir" = "${HOME}" ]]
-then
-    export AUTOJUMP_DATA_DIR=${data_dir}
-else
-    export AUTOJUMP_DATA_DIR=${data_dir}/autojump
-fi
-if [ ! -e "${AUTOJUMP_DATA_DIR}" ]
-then
-    mkdir "${AUTOJUMP_DATA_DIR}"
+export AUTOJUMP_DATA_DIR=${HOME}/.autojump
+if [ ! -d ${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
@@ -44,7 +37,8 @@ fi
 
 AUTOJUMP='{ [[ "$AUTOJUMP_HOME" == "$HOME" ]] && (autojump -a "$(pwd -P)"&)>/dev/null 2>>${AUTOJUMP_DATA_DIR}/autojump_errors;} 2>/dev/null'
 if [[ ! $PROMPT_COMMAND =~ autojump ]]; then
-  export PROMPT_COMMAND="${PROMPT_COMMAND:-:} ; $AUTOJUMP"
-fi 
+    export PROMPT_COMMAND="${PROMPT_COMMAND:-:} ; $AUTOJUMP"
+fi
+
 alias jumpstat="autojump --stat"
-function j { new_path="$(autojump $@)";if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; cd "$new_path";else false; fi }
+function j { new_path="$(autojump $@)";if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; cd "$new_path"; else false; fi }

install.sh

@@ -19,9 +19,6 @@ function show_help {
         echo "sudo ./install.sh [--prefix /usr/local]"
 }
 
-# Default install directory.
-prefix=/usr
-
 # Command line parsing
 while true; do
     case "$1" in
@@ -38,21 +35,62 @@ while true; do
     esac
 done
 
+uninstall=0;
+if [ -f "/usr/bin/autojump" ]; then
+    while true; do
+        read -p "Old installation detected, remove? [Yn] " yn
+        case $yn in
+            [Yy]* ) uninstall=1; break;;
+            [Nn]* ) "Already installed, exiting." exit 1;;
+            * ) uninstall=1; break;;
+        esac
+    done
+fi
+
+if [ ${uninstall} == 1 ]; then
+    echo "Deleting old installation files ..."
+    sudo rm -r /usr/share/autojump/
+    sudo rm /usr/bin/autojump
+    sudo rm /usr/bin/jumpapplet
+    sudo rm /usr/share/man/man1/autojump.1
+fi
+
+all_users=0;
+while true; do
+    read -p "Install for all users (requires root)? [Yn] " yn
+    case $yn in
+        [Yy]* ) all_users=1; break;;
+        [Nn]* ) all_users=0; break;;
+        * ) all_users=1; break;;
+    esac
+done
+
+prefix=/usr/local
+if [ ${all_users} == 0 ]; then
+    prefix=${HOME}/.autojump
+fi
+
 echo "Installing to ${prefix} ..."
 
 # INSTALL AUTOJUMP
-sudo mkdir -p ${prefix}/share/autojump/
-sudo mkdir -p ${prefix}/bin/
-sudo mkdir -p ${prefix}/share/man/man1/
-sudo cp icon.png ${prefix}/share/autojump/
-sudo cp jumpapplet ${prefix}/bin/
-sudo cp autojump ${prefix}/bin/
-sudo cp autojump.1 ${prefix}/share/man/man1/
-
-if [ -d "/etc/profile.d" ]; then
+if [ ${all_users} == 1 ]; then
+    sudo mkdir -p ${prefix}/share/autojump/
+    sudo mkdir -p ${prefix}/bin/
+    sudo mkdir -p ${prefix}/share/man/man1/
+    sudo cp icon.png ${prefix}/share/autojump/
+    sudo cp jumpapplet ${prefix}/bin/
+    sudo cp autojump ${prefix}/bin/
+    sudo cp autojump.1 ${prefix}/share/man/man1/
+    sudo mkdir -p /etc/profile.d/
     sudo cp autojump.bash /etc/profile.d/
     sudo cp autojump.sh /etc/profile.d/
 
+    # Fail sudo install
+    if [ ! -f ${prefix}/bin/autojump ] || [ ! -f ${prefix}/share/man/man1/autojump.1 ] || [ ! -f /etc/profile.d/autojump.bash ] || [ ! -f /etc/profile.d/autojump.sh ]; then
+        echo "Autojump was not installed, please try again using single user installation or with the correct sudo password."
+        exit 1
+    fi
+
     # Make sure that the code we just copied has been sourced.
     # check if .bashrc has sourced /etc/profile or /etc/profile.d/autojump.bash
     if [ `grep -c "^[[:space:]]*\(source\|\.\) /etc/profile\(\.d/autojump\.bash\)[[:space:]]*$" ~/.bashrc` -eq 0 ]; then
@@ -62,35 +100,46 @@ if [ -d "/etc/profile.d" ]; then
         echo "# Added by autojump install.sh" >> ~/.bashrc
         echo "source /etc/profile.d/autojump.bash" >> ~/.bashrc
     fi
-    echo "Done!"
-    echo
-    echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump."
 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 ~/.bashrc file to make it work? (If you have done this once before, delete the old version before doing it again.) [y/n]"
-    read ans
-    if [ ${#ans} -gt 0 ]; then
-	     if [ $ans = "y" -o $ans = "Y" -o $ans = "yes" -o $ans = "Yes" ]; then
+    mkdir -p ${prefix}/share/autojump/
+    mkdir -p ${prefix}/bin/
+    mkdir -p ${prefix}/share/man/man1/
+    cp icon.png ${prefix}/share/autojump/
+    cp jumpapplet ${prefix}/bin/
+    cp autojump ${prefix}/bin/
+    cp autojump.1 ${prefix}/share/man/man1/
+    mkdir -p ${prefix}/etc/profile.d/
+    cp autojump.bash ${prefix}/etc/profile.d/
+    cp autojump.sh ${prefix}/etc/profile.d/
 
-                # Answered yes. Go ahead and add the autojump code
-	        echo "" >> ~/.bashrc
-	        echo "#autojump" >> ~/.bashrc
-	        cat autojump.bash | grep -v "^#" >> ~/.bashrc
-
-                # 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 `grep -c "^[[:space:]]*\(source\|\.\) /etc/profile\(\.d/autojump\.bash\)[[:space:]]*$" ~/.bash_profile` -eq 0 ]; then
-                    echo "You are using OSX and your .bash_profile doesn't seem to be sourcing .bashrc"
-                    echo "Adding source ~/.bashrc to your bashrc"
-                    echo -e "\n# Get the aliases and functions" >> ~/.bash_profile
-                    echo -e "if [ -f ~/.bashrc ]; then\n  . ~/.bashrc\nfi" >> ~/.bash_profile
-                fi
-                echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump."
-	     else
-	         echo "Then you need to put autojump.sh, or the code from it, somewhere where it will get read. Good luck!"
-	     fi
-    else
-        echo "Then you need to put autojump.sh, or the code from it, somewhere where it will get read. Good luck!"
+    if [ `grep -c "^[[:space:]]*\(source\|\.\) ${prefix}/etc/profile\(\.d/autojump\.bash\)[[:space:]]*$" ~/.bashrc` -eq 0 ]; then
+        echo "Your .bashrc doesn't seem to source /etc/profile or /etc/profile.d/autojump.bash"
+        echo "Adding the /etc/profile.d/autojump.bash to your .bashrc"
+        echo "" >> ~/.bashrc
+        echo "# Added by autojump install.sh" >> ~/.bashrc
+        echo "source ${prefix}/etc/profile.d/autojump.bash" >> ~/.bashrc
     fi
+
+    if [ `grep -c ".*PATH.*.autojump/bin" ~/.bashrc` -eq 0 ]; then
+        echo "Your .bashrc doesn't seem to have ${prefix}/bin in your \$PATH"
+        echo "Adding the ${prefix}/bin/ to your PATH"
+        echo "" >> ~/.bashrc
+        echo "# Added by autojump install.sh" >> ~/.bashrc
+        echo 'export PATH=${PATH}:~/.autojump/bin' >> ~/.bashrc
+    fi
+
 fi
+
+# 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.
+if [ `uname` == "Darwin" ] && [ `grep -c "^[[:space:]]*\(source\|\.\).*\.bashrc[[:space:]]*$" ~/.bash_profile` -eq 0 ]; then
+    echo "Your .bash_profile doesn't seem to be sourcing .bashrc"
+    echo "Adding source ~/.bashrc to your bashrc"
+    echo -e "\n# Get the aliases and functions" >> ~/.bash_profile
+    echo -e "if [ -f ~/.bashrc ]; then\n  . ~/.bashrc\nfi" >> ~/.bash_profile
+fi
+
+echo "Done!"
+echo
+echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump."

jumpapplet

@@ -168,7 +168,7 @@ def settings(sender):
     window.set_border_width(3)
     window.set_resizable(False)
     if os.path.isfile("icon.png"): window.set_icon_from_file("icon.png")
-    elif os.path.isfile("/usr/share/autojump/icon.png"): window.set_icon_from_file("/usr/share/autojump/icon.png")
+    elif os.path.isfile("/usr/local/share/autojump/icon.png"): window.set_icon_from_file("/usr/local/share/autojump/icon.png")
 
     vbox=gtk.Table(5,2)
     vbox.set_row_spacings(3)
@@ -234,7 +234,7 @@ def save_settings(sender,response,entries,window):
 def init():
     load_settings_file()
     if os.path.isfile("icon.png"): icon=gtk.status_icon_new_from_file("icon.png")
-    elif os.path.isfile("/usr/share/autojump/icon.png"): icon=gtk.status_icon_new_from_file("/usr/share/autojump/icon.png")
+    elif os.path.isfile("/usr/local/share/autojump/icon.png"): icon=gtk.status_icon_new_from_file("/usr/local/share/autojump/icon.png")
     else: icon=gtk.status_icon_new_from_icon_name("help")
     icon.set_visible(True)
     icon.connect("popup-menu",popup)