refact init.sh loading

README.md

@@ -12,10 +12,9 @@ flowchart LR
     subgraph bash-helpers
     init["init.sh"]
     any["os_any.bash"]
-    os-dependent["
-        os_mac.bash
-        os_ubu.bash
-        os_win.bash"]
+    win["os_win.bash"]
+    ubu["os_ub.bash"]
+    mac["os_mac.bash"]
     command-dependent["
         lib/COMMAND_NAME_1.bash
         lib/COMMAND_NAME_2.bash
@@ -24,9 +23,11 @@ flowchart LR
     "]
     end
     bashrc --> |"load"| init
-    init --> |"load"|any
-    init --> |"if $OSTYPE then load"|os-dependent
-    init --> |"if type COMMAND_NAME then load"|command-dependent
+    init --> |"always load"|any
+    init --> |"if $OSTYPE == msys* || -n $WSL_DISTRO_NAME then load"|win
+    init --> |"if $OSTYPE == linux* then load"|ubu
+    init --> |"if $OSTYPE == mac* then load"|mac
+    init --> |"foreach in lib/*: if type COMMAND_NAME then load"|command-dependent
 ```
 
 

init.sh

@@ -7,20 +7,19 @@ BH_DIR="$(dirname "${BASH_SOURCE[0]}")"
 #########################
 
 source "$BH_DIR/os_any.bash"
-case $OSTYPE in
-msys*)
-  source "$BH_DIR/os_win.bash"
-  ;;
-linux*)
-  source "$BH_DIR/os_ubu.bash"
-  if [[ -n $WSL_DISTRO_NAME ]]; then
-    source "$BH_DIR/os_win.bash";
-  fi
-  ;;
-darwin*)
-  source "$BH_DIR/os_mac.bash"
-  ;;
-esac
+
+if [[ $OSTYPE == msys* || -n $WSL_DISTRO_NAME ]]; then
+  echo source "$BH_DIR/os_win.bash";
+fi
+
+if [[ $OSTYPE == linux* ]]; then
+  echo source "$BH_DIR/os_ubu.bash"
+fi
+
+if [[ $OSTYPE == darwin* ]]; then
+  echo source "$BH_DIR/os_mac.bash"
+fi
+
 
 #########################
 # load <command>.bash files

os_win.bash

@@ -5,7 +5,7 @@
 alias ls='ls --color=auto -I NTUSER\* -I ntuser\* -I AppData -I IntelGraphicsProfiles* -I MicrosoftEdgeBackups'
 BH_LIB_PS1="$BH_DIR/scripts/"
 
-if [[ $OSTYPE == linux* && -n $WSL_DISTRO_NAME ]]; then
+if [[ -n $WSL_DISTRO_NAME ]]; then
   alias winpath='wslpath -m'
 elif [[ $OSTYPE == linux* ]]; then
   alias winpath='cygpath -m'