From 4da9d3ef756b5893631d56d5c67d4407017be179 Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 7 Feb 2012 15:40:57 -1000 Subject: [PATCH 1/4] bash local installation finished --- install.sh | 158 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 91 insertions(+), 67 deletions(-) diff --git a/install.sh b/install.sh index 7547a9b..11d2abf 100755 --- a/install.sh +++ b/install.sh @@ -16,21 +16,12 @@ #along with autojump. If not, see . function show_help { - echo "sudo ./install.sh [--prefix /usr/local]" -} - -function die { - echo "$@" >&2 - exit 1 -} - -function warn { - echo "WARNING: $@" >&2 + echo "sudo ./install.sh [--local] [--prefix /usr/local]" } # Default install directory. prefix=/usr -profile_d=/etc/profile.d +local=false user=${SUDO_USER:-${USER}} OS=`uname` @@ -40,25 +31,49 @@ if [ $OS == 'Darwin' ]; then else user_home=$(getent passwd ${user} | cut -d: -f6) fi - bashrc_file=${user_home}/.bashrc +bashrc_file=${user_home}/.bashrc # Command line parsing while true; do case "$1" in - -h|--help|-\?) show_help; exit 0;; - -p|--prefix) if [ $# -gt 1 ]; then - prefix=$2; shift 2 - profile_d=$prefix/etc/autojump - else - die "--prefix or -p require an argument" - fi ;; - --) shift; break;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; - *) break;; + -h|--help|-\?) + show_help; + exit 0 + ;; + -l|--local) + local=true + prefix=~/.autojump + shift + ;; + -p|--prefix) + if [ $# -gt 1 ]; then + prefix=$2; shift 2 + profile_d=$prefix/etc/autojump + else + die "--prefix or -p require an argument" + fi + ;; + --) + shift + break + ;; + -*) + echo "invalid option: $1" 1>&2; + show_help; + exit 1 + ;; + *) + break + ;; esac done -echo "Installing to ${prefix} ..." +if [[ ${UID} != 0 ]] && ! ${local}; then + echo "Please rerun as root or use the --local option." + exit 1 +fi + +echo "Installing main files to ${prefix} ..." # add git revision to autojump ./git-version.sh @@ -72,53 +87,62 @@ cp jumpapplet ${prefix}/bin/ cp autojump ${prefix}/bin/ cp autojump.1 ${prefix}/share/man/man1/ -mkdir -p "$profile_d" -if [ ! -d "$profile_d" ] -then - warn "$profile_d does not exist, and I can't create it." -fi +if ( ! ${local} ); then + if [ -d "/etc/profile.d" ]; then + cp -v autojump.bash /etc/profile.d/ + cp -v autojump.sh /etc/profile.d/ -if [ -d "$profile_d" ]; then - cp autojump.bash $profile_d/ - cp autojump.sh $profile_d/ + # 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_file}` -eq 0 ]; then + echo "Your .bashrc doesn't seem to source /etc/profile or $profile_d/autojump.bash" + echo "Adding the /etc/profile.d/autojump.bash to your .bashrc" + echo "" >> ${bashrc_file} + echo "# Added by autojump install.sh" >> ${bashrc_file} + echo "source /etc/profile.d/autojump.bash" >> ${bashrc_file} + 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 $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 + # Answered yes. Go ahead and add the autojump code + echo "" >> ${bashrc_file} + echo "#autojump" >> ${bashrc_file} + cat autojump.bash | grep -v "^#" >> ${bashrc_file} - # Make sure that the code we just copied has been sourced. - # check if .bashrc has sourced /etc/profile or $profile_d/autojump.bash - if [ `grep -c "^[[:space:]]*\(source\|\.\) /etc/profile\(\.d/autojump\.bash\)[[:space:]]*$" ${bashrc_file}` -eq 0 ]; then - echo "Your .bashrc doesn't seem to source /etc/profile or $profile_d/autojump.bash" - echo "Adding the $profile_d/autojump.bash to your .bashrc" - echo "" >> ${bashrc_file} - echo "# Added by autojump install.sh" >> ${bashrc_file} - echo "source $profile_d/autojump.bash" >> ${bashrc_file} + # 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 [ $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" + echo -e "\n# Get the aliases and functions" >> ~/.bash_profile + echo -e "if [ -f ${bashrc_file} ]; then\n . ${bashrc_file}\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 fi - echo "Done!" +else + mkdir -p ${prefix}/etc/profile.d/ + cp autojump.bash ${prefix}/etc/profile.d/ + cp autojump.sh ${prefix}/etc/profile.d/ + + echo + echo "Add the following lines to your ~/.bashrc:" + echo + echo -e "\tsource ${prefix}/etc/profile.d/autojump.bash" echo echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump." -else - echo "Your distribution does not have a $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 - - # Answered yes. Go ahead and add the autojump code - echo "" >> ${bashrc_file} - echo "#autojump" >> ${bashrc_file} - cat autojump.bash | grep -v "^#" >> ${bashrc_file} - - # 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 [ $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" - echo -e "\n# Get the aliases and functions" >> ~/.bash_profile - echo -e "if [ -f ${bashrc_file} ]; then\n . ${bashrc_file}\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 + echo + echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.zshrc." fi + From aad05217557a42a1589ab4766fcdf5129f98c439 Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 7 Feb 2012 15:52:15 -1000 Subject: [PATCH 2/4] change test constructs for bash installation --- install.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/install.sh b/install.sh index 11d2abf..2f1570d 100755 --- a/install.sh +++ b/install.sh @@ -21,7 +21,7 @@ function show_help { # Default install directory. prefix=/usr -local=false +local=0 user=${SUDO_USER:-${USER}} OS=`uname` @@ -41,7 +41,7 @@ while true; do exit 0 ;; -l|--local) - local=true + local=1 prefix=~/.autojump shift ;; @@ -68,7 +68,7 @@ while true; do esac done -if [[ ${UID} != 0 ]] && ! ${local}; then +if [[ ${UID} != 0 ]] && [ ! ${local} ]; then echo "Please rerun as root or use the --local option." exit 1 fi @@ -82,12 +82,12 @@ echo "Installing main files to ${prefix} ..." 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/ +cp -v icon.png ${prefix}/share/autojump/ +cp -v jumpapplet ${prefix}/bin/ +cp -v autojump ${prefix}/bin/ +cp -v autojump.1 ${prefix}/share/man/man1/ -if ( ! ${local} ); then +if [ ! ${local} ]; then if [ -d "/etc/profile.d" ]; then cp -v autojump.bash /etc/profile.d/ cp -v autojump.sh /etc/profile.d/ @@ -133,8 +133,8 @@ if ( ! ${local} ); then fi else mkdir -p ${prefix}/etc/profile.d/ - cp autojump.bash ${prefix}/etc/profile.d/ - cp autojump.sh ${prefix}/etc/profile.d/ + cp -v autojump.bash ${prefix}/etc/profile.d/ + cp -v autojump.sh ${prefix}/etc/profile.d/ echo echo "Add the following lines to your ~/.bashrc:" @@ -143,6 +143,6 @@ else echo echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump." echo - echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.zshrc." + echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.bashrc." fi From 149863c322caf5dcd94240f95cc0560df2c4af51 Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 7 Feb 2012 16:02:49 -1000 Subject: [PATCH 3/4] bash uninstallation modified to detected and remove local installations --- uninstall.sh | 55 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/uninstall.sh b/uninstall.sh index b935427..3b93213 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -30,33 +30,46 @@ if [ $OS == 'Darwin' ]; then else user_home=$(getent passwd ${user} | cut -d: -f6) fi - bashrc_file=${user_home}/.bashrc +bashrc_file=${user_home}/.bashrc # Command line parsing while true; do case "$1" in - -h|--help|-\?) show_help; exit 0;; - -p|--prefix) if [ $# -gt 1 ]; then - prefix=$2; shift 2 - else - echo "--prefix or -p require an argument" 1>&2 - exit 1 - fi ;; - --) shift; break;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; - *) break;; + -h|--help|-\?) show_help; exit 0;; + -p|--prefix) + if [ $# -gt 1 ]; then + prefix=$2; shift 2 + else + echo "--prefix or -p require an argument" 1>&2 + exit 1 + fi + ;; + --) shift; break;; + -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; + *) break;; esac done -echo -e "Uninstalling from ${prefix} ...\n" - # UNINSTALL AUTOJUMP -sudo rm -rv ${prefix}/share/autojump/ -sudo rm -v ${prefix}/bin/jumpapplet -sudo rm -v ${prefix}/bin/autojump -sudo rm -v ${prefix}/share/man/man1/autojump.1 -sudo rm -v /etc/profile.d/autojump.bash -sudo rm -v /etc/profile.d/autojump.sh +# global / custom location installations +if [ -d "${prefix}/share/autojump/" ]; then + echo -e "\nUninstalling from ${prefix} ...\n" + sudo rm -rv ${prefix}/share/autojump/ + sudo rm -v ${prefix}/bin/jumpapplet + sudo rm -v ${prefix}/bin/autojump + sudo rm -v ${prefix}/share/man/man1/autojump.1 + sudo rm -v /etc/profile.d/autojump.zsh + sudo rm -v /etc/profile.d/autojump.sh -echo -e "\nPlease remove the line from ${bashrc_file} :\n" -echo -e "\tsource /etc/profile.d/autojump.bash" + echo -e "\nPlease remove the line from ${bashrc_file} :\n" + echo -e "\tsource /etc/profile.d/autojump.bash" +fi + +# local installations +if [ -d ~/.autojump/ ]; then + echo -e "\nUninstalling from ~/.autojump/ ...\n" + rm -rv ~/.autojump/ + + echo -e "\nPlease remove the line from ${bashrc_file} :\n" + echo -e "\tsource ~/.autojump/profile.d/autojump.bash" +fi From 770b80bfe474c02b02905ce1509f6d9819dd015f Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 7 Feb 2012 16:21:37 -1000 Subject: [PATCH 4/4] fix install.sh test construct, simplified install.sh, minor formatting changes --- install.sh | 52 ++++++++++++---------------------------------------- uninstall.sh | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 44 deletions(-) diff --git a/install.sh b/install.sh index 2f1570d..aa7ba0f 100755 --- a/install.sh +++ b/install.sh @@ -21,7 +21,7 @@ function show_help { # Default install directory. prefix=/usr -local=0 +local= user=${SUDO_USER:-${USER}} OS=`uname` @@ -41,14 +41,13 @@ while true; do exit 0 ;; -l|--local) - local=1 + local=true prefix=~/.autojump shift ;; -p|--prefix) if [ $# -gt 1 ]; then prefix=$2; shift 2 - profile_d=$prefix/etc/autojump else die "--prefix or -p require an argument" fi @@ -73,7 +72,7 @@ if [[ ${UID} != 0 ]] && [ ! ${local} ]; then exit 1 fi -echo "Installing main files to ${prefix} ..." +echo -e "Installing files to ${prefix} ...\n" # add git revision to autojump ./git-version.sh @@ -92,44 +91,17 @@ if [ ! ${local} ]; then cp -v autojump.bash /etc/profile.d/ cp -v autojump.sh /etc/profile.d/ - # 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_file}` -eq 0 ]; then - echo "Your .bashrc doesn't seem to source /etc/profile or $profile_d/autojump.bash" - echo "Adding the /etc/profile.d/autojump.bash to your .bashrc" - echo "" >> ${bashrc_file} - echo "# Added by autojump install.sh" >> ${bashrc_file} - echo "source /etc/profile.d/autojump.bash" >> ${bashrc_file} - fi - echo "Done!" + echo + echo "Add the following lines to your ~/.bashrc:" + echo + echo -e "\tsource ${prefix}/etc/profile.d/autojump.bash" echo echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump." + echo + echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.bashrc." + echo else - echo "Your distribution does not have a $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 - # Answered yes. Go ahead and add the autojump code - echo "" >> ${bashrc_file} - echo "#autojump" >> ${bashrc_file} - cat autojump.bash | grep -v "^#" >> ${bashrc_file} - - # 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 [ $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" - echo -e "\n# Get the aliases and functions" >> ~/.bash_profile - echo -e "if [ -f ${bashrc_file} ]; then\n . ${bashrc_file}\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 + echo "Your distribution does not have a '/etc/profile.d/' directory, please create it manually or use the local install option." fi else mkdir -p ${prefix}/etc/profile.d/ @@ -144,5 +116,5 @@ else echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump." echo echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.bashrc." + echo fi - diff --git a/uninstall.sh b/uninstall.sh index 3b93213..2d1ac1a 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -58,18 +58,26 @@ if [ -d "${prefix}/share/autojump/" ]; then sudo rm -v ${prefix}/bin/jumpapplet sudo rm -v ${prefix}/bin/autojump sudo rm -v ${prefix}/share/man/man1/autojump.1 - sudo rm -v /etc/profile.d/autojump.zsh + sudo rm -v /etc/profile.d/autojump.bash sudo rm -v /etc/profile.d/autojump.sh - echo -e "\nPlease remove the line from ${bashrc_file} :\n" + echo + echo "Please remove the line from ${bashrc_file} :" + echo echo -e "\tsource /etc/profile.d/autojump.bash" + echo fi # local installations if [ -d ~/.autojump/ ]; then - echo -e "\nUninstalling from ~/.autojump/ ...\n" + echo + echo "Uninstalling from ~/.autojump/ ..." + echo rm -rv ~/.autojump/ - echo -e "\nPlease remove the line from ${bashrc_file} :\n" + echo + echo "Please remove the line from ${bashrc_file} :" + echo echo -e "\tsource ~/.autojump/profile.d/autojump.bash" + echo fi