From ff71141e7661507a163b9108c50bbb1dc7848e8a Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 21 Aug 2013 14:02:50 +0200 Subject: [PATCH] sde-install: change `sudo ./bin/sde install` to install at /usr/local/bin instead of $HOME/bin, because on some systems `sudo` alters $PATH for security reasons Signed-off-by: Alejandro Mery --- bin/sde-install | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/sde-install b/bin/sde-install index 5bccfbf..0b9e033 100755 --- a/bin/sde-install +++ b/bin/sde-install @@ -20,8 +20,6 @@ set -e [ -n "$SDEROOT" ] || export SDEROOT=$( cd "${0%/*}/.."; pwd -P ) -[ -z "$SUDO_USER" ] || export HOME=/root - . $SDEROOT/lib/libsde.in install_usage() { @@ -32,21 +30,27 @@ Usage: sde install EOT } +if [ -n "$SUDO_USER" -a "$SUDO_USER" != "$USER" ]; then + BINDIR="/usr/local/bin" +else + BINDIR="$HOME/bin" +fi + # what action was requested? if [ $# -ne 0 ]; then install_usage -elif [ -L "$HOME/bin/sde" ]; then - if [ "$( readlink -f $HOME/bin/sde )" = "$SDEROOT/bin/sde" ]; then +elif [ -L "$BINDIR/sde" ]; then + if [ "$( readlink -f $BINDIR/sde )" = "$SDEROOT/bin/sde" ]; then echo_warning "the same sde wrapper is already installed, skip." else - echo_warning "sde wrapper already installed [$( readlink -f $HOME/bin/sde )]" - ln -sf "$SDEROOT/bin/sde" "$HOME/bin/sde" - echo_info "sde wrapper reinstalled at $HOME/bin/" + echo_warning "sde wrapper already installed [$( readlink -f $BINDIR/sde )]" + ln -sf "$SDEROOT/bin/sde" "$BINDIR/sde" + echo_info "sde wrapper reinstalled at $BINDIR/" fi -elif [ -e "$HOME/bin/sde" ]; then - echo_abort 1 "Something is already at '$HOME/bin/sde', this is not supported." +elif [ -e "$BINDIR/sde" ]; then + echo_abort 1 "Something is already at '$BINDIR/sde', this is not supported." else - mkdir -p "$HOME/bin/" - ln -s "$SDEROOT/bin/sde" "$HOME/bin/sde" - echo_info "sde wrapper installed at $HOME/bin/" + mkdir -p "$BINDIR/" + ln -s "$SDEROOT/bin/sde" "$BINDIR/sde" + echo_info "sde wrapper installed at $BINDIR/" fi