mirror of
https://github.com/wting/autojump
synced 2024-10-27 20:34:07 +00:00
change default location to /usr/local/, remove existing installation in /usr/ if detected.
This commit is contained in:
parent
4f7690fd28
commit
b021f23327
14
README.rst
14
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``.
|
||||
|
||||
|
22
install.sh
22
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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user