diff --git a/_home/private_dot_local/bin/executable_szetup-kubectl4k3s b/_home/private_dot_local/bin/executable_szetup-kubectl4k3s index bdeb8ab..1ec4e51 100644 --- a/_home/private_dot_local/bin/executable_szetup-kubectl4k3s +++ b/_home/private_dot_local/bin/executable_szetup-kubectl4k3s @@ -4,29 +4,23 @@ # - uneeded, as this checked whether script is sourced # SC1090 Can't follow non-constant source -# Use basename instead of ${0:##*/} to be POSIX compliant -# Some shells return - in $0 when sourced, ${0#-} drops that initial dash -BASE_0=${BASE_0:-$(basename -- "${0#-}")} +# 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 is_sourced() { - DBG_="$( - printf '\n\t\t%-12s%s' '$0:' "$0" BASE_0: "$BASE_0" BASE_SHELL: "$BASE_SHELL" - )" if [ -n "$ZSH_VERSION" ]; then case $ZSH_EVAL_CONTEXT in *:file:*) return 0;; esac else - case "$(basename -- "${0}")" in $BASE_SHELL|-$BASE_SHELL) return 0;; esac + # case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh) return 0;; esac + case "${BASE_0}" in $BASE_SHELL|-$BASE_SHELL) return 0;; esac fi return 1; # NOT sourced. } -if [[ "$1" == '-' ]]; then - printf 'BASE_0="%s"\nSCRIPT_DIR=%s\n' "${BASE_0}" "${SCRIPT_DIR}" - cat "${BASH_SOURCE[0]}" -elif is_sourced; then +if is_sourced; then # This part is sourced, and might run in a non-bash shell DBG_="Is Sourced" USER_HOME=$HOME @@ -113,6 +107,9 @@ elif is_sourced; then kubectl get "${NS:+--namespace=}${NS:---all-namespaces}" "${@:-pods}" | { sed -u 1q; sort; } } fi +elif [[ "$1" == '-' ]]; then + printf 'BASE_0="%s"\nSCRIPT_DIR=%s\n' "${BASE_0}" "${SCRIPT_DIR}" + cat "${BASH_SOURCE[0]}" else SCRIPT_NAME="$BASE_0" printf '%s\n' \ diff --git a/_home/private_dot_local/bin/symlink_runtipictl b/_home/private_dot_local/bin/symlink_runtipictl deleted file mode 100644 index bb3a8f7..0000000 --- a/_home/private_dot_local/bin/symlink_runtipictl +++ /dev/null @@ -1 +0,0 @@ -/mnt/wolfpack/data/apps.docker/runtipi/user-config/_bin/runtipictl