improve bash settings

Author: sasaplus1

bash/.bashrc.d/interactive

@@ -1,32 +1,28 @@
 #!/bin/bash
 # NOTE: shebang for shellcheck
 
-# shellcheck disable=SC1091
-[ -r "$HOME/.cache/sh_user_path" ] && source "$HOME/.cache/sh_user_path"
+__main() {
+  unset -f __main
 
-# shellcheck disable=SC1091
-source "$HOME/.bashrc.d/profile"
+  #-----------------------------------------------------------------------------
 
-# return if not interactive
-# https://www.gnu.org/software/bash/manual/html_node/Is-this-Shell-Interactive_003f.html
-#[ -z "$PS1" ] && return
-[[ ! "$-" =~ i ]] && return
+  # shellcheck disable=SC1091
+  [ -r "$HOME/.cache/sh_user_path" ] && source "$HOME/.cache/sh_user_path"
 
-__main() {
-  unset -f __main
+  # shellcheck disable=SC1091
+  source "$HOME/.bashrc.d/profile"
+
+  # return if not interactive
+  # https://www.gnu.org/software/bash/manual/html_node/Is-this-Shell-Interactive_003f.html
+  #[ -z "$PS1" ] && return
+  [[ ! "$-" =~ i ]] && return
 
   #-----------------------------------------------------------------------------
 
   case "$OSTYPE" in
-    darwin*)
-      local -r os=macos
-      ;;
-    linux*)
-      local -r os=linux
-      ;;
-    *)
-      local -r os=
-      ;;
+    darwin*) local -r os=macos ;;
+    linux*)  local -r os=linux ;;
+    *)       local -r os= ;;
   esac
 
   # current session architecture

bash/.bashrc.d/path

@@ -5,15 +5,9 @@ __main() {
   unset -f __main
 
   case "$OSTYPE" in
-    darwin*)
-      local -r os=macos
-      ;;
-    linux*)
-      local -r os=linux
-      ;;
-    *)
-      local -r os=
-      ;;
+    darwin*) local -r os=macos ;;
+    linux*)  local -r os=linux ;;
+    *)       local -r os= ;;
   esac
 
   #-----------------------------------------------------------------------------
@@ -209,6 +203,12 @@ __main() {
     printf "export PATH='%s'\n" "$PATH"
     printf "export MANPATH='%s'\n" "$MANPATH"
     printf "export INFOPATH='%s'\n" "$INFOPATH"
+    # App paths
+    printf "export AQUA_GLOBAL_CONFIG='%s'\n" "$AQUA_GLOBAL_CONFIG"
+    printf "export GHQ_ROOT='%s'\n" "$GHQ_ROOT"
+    printf "export GOPATH='%s'\n" "$GOPATH"
+    [ -n "$HOMEBREW_PREFIX" ] && printf "export HOMEBREW_PREFIX='%s'\n" "$HOMEBREW_PREFIX"
+    [ -n "$PROTO_HOME" ] && printf "export PROTO_HOME='%s'\n" "$PROTO_HOME"
   } > "$HOME/.cache/sh_user_path"
 }
 __main "$@"