Merge pull request #95 from wting/bash-install-local

bash: local installation
pull/97/merge
Joel Schaerer 13 years ago
commit 8c546913e3

@ -16,21 +16,12 @@
#along with autojump. If not, see <http://www.gnu.org/licenses/>.
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=
user=${SUDO_USER:-${USER}}
OS=`uname`
@ -40,25 +31,48 @@ 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
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 -e "Installing files to ${prefix} ...\n"
# add git revision to autojump
./git-version.sh
@ -67,58 +81,40 @@ echo "Installing 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/
mkdir -p "$profile_d"
if [ ! -d "$profile_d" ]
then
warn "$profile_d does not exist, and I can't create it."
fi
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 $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}
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 [ -d "/etc/profile.d" ]; then
cp -v autojump.bash /etc/profile.d/
cp -v autojump.sh /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."
echo
echo "To remove autojump, delete the ${prefix} directory and relevant lines from ~/.bashrc."
echo
else
echo "Your distribution does not have a '/etc/profile.d/' directory, please create it manually or use the local install option."
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
mkdir -p ${prefix}/etc/profile.d/
cp -v autojump.bash ${prefix}/etc/profile.d/
cp -v autojump.sh ${prefix}/etc/profile.d/
# 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 "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
fi

@ -30,33 +30,54 @@ 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
echo -e "\nPlease remove the line from ${bashrc_file} :\n"
echo -e "\tsource /etc/profile.d/autojump.bash"
# 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.bash
sudo rm -v /etc/profile.d/autojump.sh
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
echo "Uninstalling from ~/.autojump/ ..."
echo
rm -rv ~/.autojump/
echo
echo "Please remove the line from ${bashrc_file} :"
echo
echo -e "\tsource ~/.autojump/profile.d/autojump.bash"
echo
fi

Loading…
Cancel
Save