fix: add rancher bin to path, to override container utilities

Author: seantrane

shell/paths.sh

@@ -3,7 +3,7 @@
 # PATH / MANPATH exports
 # Defines the $PATH export/variable for shell environments.
 
-type "find_files" &> /dev/null || . "$DOTFILES/functions/find_files"
+type "find_files" &>/dev/null || . "$DOTFILES/functions/find_files"
 
 #-------------------------------------------------------------------------------
 # BINARIES/SCRIPTS
@@ -31,23 +31,34 @@ export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
 
 # LOAD DOTFILES PATHS:
 # for file in ~/.dotfiles/{git,system}/path.sh; do
-for _file in $(find_files "$DOTFILES" 'path.sh' 2); do . "$_file"; done; unset _file
-
-# CUSTOM/USER PATHS
-# `~/.path` can be used to extend `$PATH`.
-[[ -f "$HOME/.path" ]] && . "$HOME/.path"
+for _file in $(find_files "$DOTFILES" 'path.sh' 2); do . "$_file"; done
+unset _file
 
 #-------------------------------------------------------------------------------
 # HOMEBREW
 #-------------------------------------------------------------------------------
 
 # Homebrew init.
-[[ -f "$DOTFILES/brew/init_install.sh" ]] && . "$DOTFILES/brew/init_install.sh" \
-  && _init_homebrew
+[[ -f "$DOTFILES/brew/init_install.sh" ]] && . "$DOTFILES/brew/init_install.sh" &&
+  _init_homebrew
 
 # Homebrew path must come first to override system binaries.
 export PATH="${HOMEBREW_PREFIX:-/usr/local}/bin:$PATH"
 
+#-------------------------------------------------------------------------------
+# RANCHER
+#-------------------------------------------------------------------------------
+
+# Rancher - finally, so Rancher can control docker, kubectl, helm, etc.
+[[ -d "$HOME/.rd/bin" ]] && export PATH="$HOME/.rd/bin:$PATH"
+
+#-------------------------------------------------------------------------------
+# CUSTOM/USER PATHS
+#-------------------------------------------------------------------------------
+
+# `~/.path` can be used to extend `$PATH`.
+[[ -f "$HOME/.path" ]] && . "$HOME/.path"
+
 #-------------------------------------------------------------------------------
 # HELP DOCS/MANUALS
 #-------------------------------------------------------------------------------
@@ -61,7 +72,7 @@ export PATH="${HOMEBREW_PREFIX:-/usr/local}/bin:$PATH"
 # CLEANUP PATH, MANPATH - Ensure arrays do not contain duplicates.
 #-------------------------------------------------------------------------------
 
-if type "awk" &> /dev/null; then
+if type "awk" &>/dev/null; then
   PATH=$(echo -n "$PATH" | awk -v RS=: '{ if (!arr[$0]++) {printf("%s%s",!ln++?"":":",$0)}}')
   export PATH
 

system/path.sh

@@ -2,10 +2,10 @@
 #
 # PATH inclusions
 
-[[ ! -d "${DOTFILES:-}" ]] && DOTFILES=$( cd "${BASH_SOURCE%/*}/.." && pwd )
+[[ ! -d "${DOTFILES:-}" ]] && DOTFILES=$(cd "${BASH_SOURCE%/*}/.." && pwd)
 
 # shellcheck disable=SC1091
-type "find_files" &> /dev/null || . "$DOTFILES/functions/find_files"
+type "find_files" &>/dev/null || . "$DOTFILES/functions/find_files"
 
 _brewd="${HOMEBREW_PREFIX:-/usr/local}"
 
@@ -58,7 +58,7 @@ _gitd="$_brewd/opt/git"
 
 _golangd="$_brewd/opt/golang"
 _gohomed="$HOME/go"
-if type "go" &> /dev/null; then
+if type "go" &>/dev/null; then
   mkdir -p "$_gohomed"/{bin,src,pkg}
   GOPATH="$_gohomed"
   [[ -d "$_golangd/libexec" ]] && GOROOT="$_golangd/libexec"
@@ -75,8 +75,8 @@ _javad="$_brewd/opt/openjdk"
 _jvmd="/Library/Java/JavaVirtualMachines"
 if [[ -d "$_javad/bin" ]]; then
   # For the system Java wrappers to find this JDK, symlink it with:
-  if [[ -d "$_jvmd" ]] && [[ ! -e "$_jvmd/openjdk.jdk" ]] \
-        && [[ -e "$_javad/libexec/openjdk.jdk" ]]; then
+  if [[ -d "$_jvmd" ]] && [[ ! -e "$_jvmd/openjdk.jdk" ]] &&
+    [[ -e "$_javad/libexec/openjdk.jdk" ]]; then
     sudo ln -sfn "$_javad/libexec/openjdk.jdk" "$_jvmd/openjdk.jdk"
   fi
   # openjdk is keg-only, which means it was not symlinked into $(brew --prefix),
@@ -125,8 +125,7 @@ if [[ -d "$_rubyd/bin" ]]; then
   # For pkg-config to find ruby you may need to set:
   [[ -d "$_rubyd/lib/pkgconfig" ]] && PKG_CONFIG_PATH="$_rubyd/lib/pkgconfig"
   # By default, binaries installed by gem will be placed into:
-  for _file in $(find_files "${HOMEBREW_PREFIX:-}/lib/ruby/gems" 'bin' 2 'd')
-  do
+  for _file in $(find_files "${HOMEBREW_PREFIX:-}/lib/ruby/gems" 'bin' 2 'd'); do
     PATH="$_file:$PATH"
   done
 fi
@@ -161,7 +160,7 @@ _terrad="$_brewd/opt/terraform"
 # Yarn
 ################################################################################
 
-type "yarn" &> /dev/null && PATH="$(yarn global bin):$PATH"
+type "yarn" &>/dev/null && PATH="$(yarn global bin):$PATH"
 
 ################################################################################
 # Homebrew
@@ -170,8 +169,8 @@ type "yarn" &> /dev/null && PATH="$(yarn global bin):$PATH"
 # Add Linuxbrew PATHs (to your .bashrc or .zshrc):
 _lbrewd="$HOME/.linuxbrew"
 if [[ -d "$_lbrewd" ]]; then
-      PATH="$_lbrewd/bin:$PATH"
-   MANPATH="$_lbrewd/share/man:$MANPATH"
+  PATH="$_lbrewd/bin:$PATH"
+  MANPATH="$_lbrewd/share/man:$MANPATH"
   INFOPATH="$_lbrewd/share/info:$INFOPATH"
 fi