diff --git a/README.rst b/README.rst
index ecc587d5771b7f192ec38ebdc601235699a76e54..b2891da630661ca7bc15f110913fb784474c0ab0 100644
--- a/README.rst
+++ b/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``.
diff --git a/install.sh b/install.sh
index a4ea75935b5e1ad866df14260aeafc4fbbc342c3..169d5cf063277ad764b2caacde9eb2c34ede4027 100755
--- a/install.sh
+++ b/install.sh
@@ -20,7 +20,7 @@ function show_help {
}
# Default install directory.
-prefix=/usr
+prefix=/usr/local
# Command line parsing
while true; do
@@ -38,6 +38,26 @@ 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
+
echo "Installing to ${prefix} ..."
# INSTALL AUTOJUMP
@@ -55,7 +75,7 @@ if [ -d "/etc/profile.d" ]; then
# 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
+ if [ `grep -c "^[[:space:]]*\(source\|\.\) /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
@@ -69,27 +89,27 @@ 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
+ if [ $ans = "y" -o $ans = "Y" -o $ans = "yes" -o $ans = "Yes" ]; then
# Answered yes. Go ahead and add the autojump code
- echo "" >> ~/.bashrc
- echo "#autojump" >> ~/.bashrc
- cat autojump.bash | grep -v "^#" >> ~/.bashrc
+ 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\|\. ~/\.bashrc[[:space:]]*$" ~/.bash_profile` -eq 0 ]; then
+ 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!"
+ fi
else
echo "Then you need to put autojump.sh, or the code from it, somewhere where it will get read. Good luck!"
fi
diff --git a/jumpapplet b/jumpapplet
index 4b44826cf1c3b73e2af228c8c52ef4c076bc4490..5ef968878139ee2e346abad234de9c60b8f599ac 100755
--- a/jumpapplet
+++ b/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)