corrected fix-kubectl path math
This commit is contained in:
parent
59c4f003a5
commit
c386ab3ef7
16
fix-kubectl
16
fix-kubectl
|
@ -4,21 +4,25 @@
|
||||||
# - uneeded, as this checked whether script is sourced
|
# - uneeded, as this checked whether script is sourced
|
||||||
# SC1090 Can't follow non-constant source
|
# SC1090 Can't follow non-constant source
|
||||||
|
|
||||||
|
# User basename instead of ${0:##*/} to be POSIX compliant
|
||||||
|
BASE_0=${BASE_0:-$(basename $0)}
|
||||||
|
SCRIPT_DIR=${SCRIPT_DIR:-"$( cd -- "$( dirname -- "$0" )" &> /dev/null && pwd )"}
|
||||||
|
BASE_SHELL=$(basename "$SHELL")
|
||||||
|
|
||||||
# Helper function
|
# Helper function
|
||||||
is_sourced() {
|
is_sourced() {
|
||||||
if [ -n "$ZSH_VERSION" ]; then
|
if [ -n "$ZSH_VERSION" ]; then
|
||||||
case $ZSH_EVAL_CONTEXT in *:file:*) return 0;; esac
|
case $ZSH_EVAL_CONTEXT in *:file:*) return 0;; esac
|
||||||
else # Add additional POSIX-compatible shell names here, if needed.
|
else
|
||||||
case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh) return 0;; esac
|
# case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh) return 0;; esac
|
||||||
|
case "$(basename $0)" in $BASE_SHELL|-$BASE_SHELL) return 0;; esac
|
||||||
fi
|
fi
|
||||||
return 1; # NOT sourced.
|
return 1; # NOT sourced.
|
||||||
}
|
}
|
||||||
|
|
||||||
BASE_0=${BASE_0:-$0}
|
|
||||||
BASE_SHELL=$(basename "$SHELL")
|
|
||||||
if is_sourced; then
|
if is_sourced; then
|
||||||
|
# This part is sourced, and might run in a non-bash shell
|
||||||
DBG_="Is Sourced"
|
DBG_="Is Sourced"
|
||||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASE_0}" )" &> /dev/null && pwd )
|
|
||||||
USER_HOME=$HOME
|
USER_HOME=$HOME
|
||||||
[[ -n "${SUDO_USER}" ]] && USER_HOME="$(eval "echo ~${SUDO_USER}")"
|
[[ -n "${SUDO_USER}" ]] && USER_HOME="$(eval "echo ~${SUDO_USER}")"
|
||||||
|
|
||||||
|
@ -101,7 +105,7 @@ if is_sourced; then
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
elif [[ "$1" == '-' ]]; then
|
elif [[ "$1" == '-' ]]; then
|
||||||
printf 'BASE_0="%s"\n' "${BASE_0}"
|
printf 'BASE_0="%s"\nSCRIPT_DIR=%s\n' "${BASE_0}" "${SCRIPT_DIR}"
|
||||||
cat "${BASH_SOURCE[0]}"
|
cat "${BASH_SOURCE[0]}"
|
||||||
else
|
else
|
||||||
SCRIPT_NAME="$BASE_0"
|
SCRIPT_NAME="$BASE_0"
|
||||||
|
|
Loading…
Reference in New Issue