From 0a172b0b9e7e301010f410d5b3bc5d5f6fccc0ab Mon Sep 17 00:00:00 2001 From: William Ting Date: Wed, 8 Feb 2012 10:25:01 -1000 Subject: [PATCH 1/4] update documentation to reflect new installation/uninstallation methods --- README.rst | 54 +++++++++++------------------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/README.rst b/README.rst index fd6aa00..3c0de5d 100644 --- a/README.rst +++ b/README.rst @@ -79,42 +79,24 @@ Installation Auto Installation ----------------- -run:: +run:: - ./install.sh + ./install.sh [ --local ] [ --zsh ] -or:: - - ./install.zsh +and follow on screen instructions. -depending on your shell. -Enter your root password if it asks. +Use --local to install into current user's home directory. -Add the line:: - - source /etc/profile - -to ``~/.bashrc`` or ``~/.zshrc`` if it isn't already there. +Use --zsh to install for Z shell. Troubleshoot ------------ If the script fails, you may need to do:: - chmod +x install.(z)sh + chmod +x install.sh -before the first step. - - -Manual installation of autojump is very simple: copy - -- autojump to /usr/bin, -- autojump.sh to /etc/profile.d, -- autojump.1 to /usr/share/man/man1. - -Make sure to source ``/etc/profile`` in your ``.bashrc`` or ``.zshrc`` :: - - source /etc/profile +before the first step. Packaging ========= @@ -126,7 +108,7 @@ For now gcarrier and I have packaged autojump for Arch Linux. It is available in Autojump is now officially a part of Debian Sid, thanks to Tanguy Ortolo’s work (for policy reasons, it requires manual activation after installing, see /usr/share/doc/autojump/README.Debian). To install, type:: apt-get install autojump - + Autojump is also available on the OSX Homebrew package manager:: brew install autojump @@ -136,24 +118,10 @@ Autojump is also packaged for a number of other distros. Check the wiki for an u Uninstallation ============== -To completely remove autojump you should remove these files: +run:: -``/etc/profile.d/autojump.bash`` + ./uninstall.sh -``/etc/profile.d/autojump.sh`` - -``/etc/profile.d/autojump.zsh`` - -``/usr/bin/autojump`` - -``/usr/bin/jumpapplet`` - -``/usr/share/autojump/icon.png`` - -``/usr/share/autojump/`` - -``/usr/share/man/man1/autojump.1`` - -Remove any mention of autojump in your ``.bashrc`` or ``.zshrc``, then in currently running shells do:``source /etc/profile``. +and follow on screen instructions. If you keep getting ``autojump: command not found`` at the Bash prompt, do:``unset PROMPT_COMMAND``. You can also restart your shell. From 9b71ed2f98b560a9d4dad00e7d3728f40d1e7caa Mon Sep 17 00:00:00 2001 From: William Ting Date: Wed, 8 Feb 2012 10:40:22 -1000 Subject: [PATCH 2/4] minor formatting change --- uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uninstall.sh b/uninstall.sh index bfe4b15..79301f0 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -26,7 +26,7 @@ function remove_msg { if [ "${1}" == "global" ]; then echo -e "\tsource /etc/profile.d/autojump.${2}" elif [ "${1}" == "local" ]; then - echo -e "\tsource ~/etc/profile.d/autojump.${2}" + echo -e "\tsource ~/.autojump/etc/profile.d/autojump.${2}" fi echo } From d5de07774f7c3881fe73930a8067129b8c787767 Mon Sep 17 00:00:00 2001 From: William Ting Date: Wed, 8 Feb 2012 10:25:01 -1000 Subject: [PATCH 3/4] update documentation to reflect new installation/uninstallation methods --- README.rst | 54 +++++++++++------------------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/README.rst b/README.rst index fd6aa00..3c0de5d 100644 --- a/README.rst +++ b/README.rst @@ -79,42 +79,24 @@ Installation Auto Installation ----------------- -run:: +run:: - ./install.sh + ./install.sh [ --local ] [ --zsh ] -or:: - - ./install.zsh +and follow on screen instructions. -depending on your shell. -Enter your root password if it asks. +Use --local to install into current user's home directory. -Add the line:: - - source /etc/profile - -to ``~/.bashrc`` or ``~/.zshrc`` if it isn't already there. +Use --zsh to install for Z shell. Troubleshoot ------------ If the script fails, you may need to do:: - chmod +x install.(z)sh + chmod +x install.sh -before the first step. - - -Manual installation of autojump is very simple: copy - -- autojump to /usr/bin, -- autojump.sh to /etc/profile.d, -- autojump.1 to /usr/share/man/man1. - -Make sure to source ``/etc/profile`` in your ``.bashrc`` or ``.zshrc`` :: - - source /etc/profile +before the first step. Packaging ========= @@ -126,7 +108,7 @@ For now gcarrier and I have packaged autojump for Arch Linux. It is available in Autojump is now officially a part of Debian Sid, thanks to Tanguy Ortolo’s work (for policy reasons, it requires manual activation after installing, see /usr/share/doc/autojump/README.Debian). To install, type:: apt-get install autojump - + Autojump is also available on the OSX Homebrew package manager:: brew install autojump @@ -136,24 +118,10 @@ Autojump is also packaged for a number of other distros. Check the wiki for an u Uninstallation ============== -To completely remove autojump you should remove these files: +run:: -``/etc/profile.d/autojump.bash`` + ./uninstall.sh -``/etc/profile.d/autojump.sh`` - -``/etc/profile.d/autojump.zsh`` - -``/usr/bin/autojump`` - -``/usr/bin/jumpapplet`` - -``/usr/share/autojump/icon.png`` - -``/usr/share/autojump/`` - -``/usr/share/man/man1/autojump.1`` - -Remove any mention of autojump in your ``.bashrc`` or ``.zshrc``, then in currently running shells do:``source /etc/profile``. +and follow on screen instructions. If you keep getting ``autojump: command not found`` at the Bash prompt, do:``unset PROMPT_COMMAND``. You can also restart your shell. From fe548ef486a57f91a2daf562823f63adfd6ea8b9 Mon Sep 17 00:00:00 2001 From: William Ting Date: Wed, 8 Feb 2012 10:51:02 -1000 Subject: [PATCH 4/4] minor documentation fix --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index c94bb9f..eabe7f3 100755 --- a/install.sh +++ b/install.sh @@ -23,7 +23,7 @@ function add_msg { if [ "${1}" == "global" ]; then echo -e "\tsource /etc/profile.d/autojump.${2}" elif [ "${1}" == "local" ]; then - echo -e "\tsource ~/etc/profile.d/autojump.${2}" + echo -e "\tsource ~/.autojump/etc/profile.d/autojump.${2}" fi echo