Speed up sourcing in functions

.vscode/settings.json

@@ -8,7 +8,7 @@
    ],
    "compile-hero.disable-compile-files-on-did-save-code": true,
    "shellcheck.enableQuickFix": true,
-   "workbench.colorTheme": "Overnight",
+   "workbench.colorTheme": "Kimbie Dark",
    "window.zoomLevel": 0,
    "customPresentationMode.backup": {},
    "gruvboxMaterial.jsson1Comments": false,

bin/bashmatic-install

@@ -13,7 +13,7 @@
 #
 set -e
 
-  # Configuration
+# Configuration
 export HOME=${HOME:-"/"}
 declare -a CHOWN_DIRS
 declare -a BREW_PACKAGES

init.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#/usr/bin/env bash
 # vim: ft=bash
 # file: lib/init.bash
 # 
@@ -20,7 +20,6 @@
 # https://github.com/kigster/bashmatic#4-installing-bashmatic
 
 set +ex
-
 export SCRIPT_SOURCE="$(cd "$(/usr/bin/dirname "${BASH_SOURCE[0]:-"${(%):-%x}"}")" || exit 1; pwd -P)"
 
 export PATH="${PATH}:/usr/local/bin:/usr/bin:/bin:/sbin"
@@ -169,16 +168,18 @@ function bashmatic.init-core() {
     printf "${BASHMATIC_PREFIX} evaluating all shell files under ${bldylw}${BASHMATIC_HOME}/lib...${clr}\n"
   }
 
-  for f in $(find "${BASHMATIC_HOME}/lib" -name '[a-z]*.sh' -type f -print); do
-    ((BASHMATIC_DEBUG)) && {
-      printf "${BASHMATIC_PREFIX} loading ${bldylw}%-50s${clr}\n" "$f"
-    }
-    source $f
-  done
-
-  for f in $(find "${BASHMATIC_HOME}/lib" -name '[a-z]*.sh' -type f -print); do
-    source $f
-  done
+  # for f in $(find "${BASHMATIC_HOME}/lib" -name '[a-z]*.sh' -type f -print); do
+  #   ((BASHMATIC_DEBUG)) && {
+  #     printf "${BASHMATIC_PREFIX} loading ${bldylw}%-50s${clr}\n" "$f"
+  #   }
+  #   source $f
+  # done
+  #
+  # for f in $(find "${BASHMATIC_HOME}/lib" -name '[a-z]*.sh' -type f -print); do
+  #  source $f
+  # done
+
+  eval "$(/bin/cat "${BASHMATIC_HOME}"/lib/*.sh)"
 
   # shellcheck disable=SC2155
   [[ ${PATH} =~ ${BASHMATIC_HOME}/bin ]] || export PATH=${PATH}:${BASHMATIC_HOME}/bin
@@ -204,7 +205,7 @@ function .bashmatic.init.darwin() {
 
   if [[ ${some_missing} -gt 0 ]]; then
     set +e
-    source "${BASHMATIC_HOME}/bin/bashmatic-install"
+    source "${BASHMATIC_HOME}/bin/bashmatic-install" >/dev/null
   fi
 
   # shellcheck disable=SC2155
@@ -231,8 +232,10 @@ function .bashmatic.init.darwin() {
 
   if [[ ${some_missing} -gt 0 ]]; then
     set +e
-    source "${BASHMATIC_HOME}/bin/bashmatic-install"
-    darwin-requirements
+    # eval "$(curl -fsSL https://bashmatic.re1.re)" >/dev/null
+    source "${BASHMATIC_HOME}/bin/bashmatic-install" >/dev/null
+    local func=".install.darwin-requirements"
+    [[ -z $(type -f ${func}) ]] || eval "${func}"
   fi
 }
 
@@ -315,4 +318,3 @@ function bashmatic.init() {
 }
 
 bashmatic.init "$@"
-

lib/7z.sh

@@ -84,3 +84,4 @@
 }
 
 7z.x() { 7z.unzip "$@"; }
+

lib/array.sh

@@ -307,3 +307,4 @@ array.eval.in-groups-of() {
 
   return 0
 }
+

lib/asciidoc.sh

@@ -18,3 +18,4 @@ function asciidoc.rouge-themes() {
   info "${bldlyw}:source-highlighter: ${bldgrn}rouge"
   info "${bldlyw}:rouge-style: ${bldgrn}monokai"
 }
+

lib/audio.sh

@@ -277,3 +277,4 @@ audio.dir.rename-karaoke-wavs() {
   audio.dir.rename-wavs karaoke "$@"
 }
 
+

lib/aws.sh

@@ -94,3 +94,4 @@ aws.ec2() {
     ;;
   esac
 }
+

lib/bashit.sh

@@ -177,3 +177,4 @@ function bashit-refresh() {
   bashit-activate "$@"
 }
 
+

lib/brew.sh

@@ -355,3 +355,4 @@ function brew.service.restart() {
   local svc="$1"
   run "brew services restart ${svc}"
 }
+

lib/caller.sh

@@ -24,3 +24,4 @@ caller.stack() {
 stack.frame() {
   caller.stack 0
 }
+

lib/color.sh

@@ -153,3 +153,4 @@ function color.disable() {
 }
 
 [[ ${BashMatic__ColorLoaded} -eq 1 ]] || color.enable
+

lib/config.sh

@@ -93,3 +93,4 @@ function config.dig.pretty() {
   config.set-format "${format}"
   return 0
 }
+

lib/db.sh

@@ -583,3 +583,4 @@ db.actions.db-settings-pretty() {
 db.actions.db-settings-toml() {
   db.psql.connect.db-settings-toml "$@"
 }
+

lib/db_cli.sh

@@ -184,3 +184,4 @@ db.cli-setup() {
 }
 
 
+

lib/db_rails.sh

@@ -33,3 +33,4 @@ db.rails.schema.checksum() {
     [[ -s ${schema} ]] && shasum.sha-only "${schema}"
   fi
 }
+

lib/db_top.sh

@@ -261,3 +261,4 @@ db.top() {
   done
   return ${code}
 }
+

lib/deploy.sh

@@ -80,3 +80,4 @@ deploy.slack-ding() {
 }
 
 ################################################################################
+

lib/dir.sh

@@ -59,3 +59,4 @@ dir.rsync-to() {
 
   rsync -avht "${from}" "${to}"  
 }
+

lib/docker.sh

@@ -224,3 +224,4 @@ docker.images.inspect() {
   local name=${1:-"<none>"}
   docker.images-named "${name}" "docker.image.inspect"
 }
+

lib/dropbox.sh

@@ -33,3 +33,4 @@ function dropbox.unignore() {
       ;;
   esac
 }
+

lib/file-helpers.sh

@@ -61,3 +61,4 @@ export bashmatic__temp_file_pattern=".bashmatic.${bashmatic__hostname}.${USER}."
   done
   return 0
 }
+

lib/file.sh

@@ -354,3 +354,4 @@ dir.find() {
 ls.mb(){
   du -k | grep -v '\''./.*\/'\' | sort -n | awk '{ printf("%20.1fMb %s\n", $1/1024, $2 )}' | tail -10
 }
+

lib/flatten.sh

@@ -54,4 +54,4 @@ function flatten-file() {
   local command="cp -v \"${path}\" ${bldylw}\"${target}\""
   printf -- "${command}"
   return 0
-}
+}

lib/ftrace.sh

@@ -62,3 +62,4 @@ ftrace-out() {
   export __LibTrace__StackLevel=$(( ${__LibTrace__StackLevel} - 1 ))
 }
 
+

lib/gem.sh

@@ -243,3 +243,4 @@ g-i() {
 g-u() {
   gem.uninstall "$@"
 }
+

lib/git.sh

@@ -355,3 +355,4 @@ function git.generate-changelog() {
 }
 
 
+

lib/github.sh

@@ -42,3 +42,4 @@ github.validate() {
 github.clone() {
   test -n "$1" && github.validate && run "git clone [email protected]:$(github.org)/$1"
 }
+

lib/gpg.sh

@@ -42,3 +42,4 @@ function gpgit.install() {
   sudo make -C "gpgit-${VERSION}" PREFIX=/usr/local install
   gpgit --helpp
 }
+

lib/is.sh

@@ -266,3 +266,4 @@ function whenever() {
 function unless() {
   ! __is.validation.error "${2}" "${1}" __is.validation.ignore-error "${@:3}"
 }
+

lib/jemalloc.sh

@@ -129,3 +129,4 @@ jm.check() {
 
   jm.jemalloc.detect-loud
 }
+

lib/json.sh

@@ -54,3 +54,4 @@ json.end-hash() {
   [[ "$1" == "true" ]] && printf ","
   echo
 }
+

lib/maths.sh

@@ -58,3 +58,4 @@ maths.eval() {
   rm -f "${temp_file}"
   return 0
 }
+

lib/net.sh

@@ -49,3 +49,4 @@ function net.is-host-port-protocol-open() {
   ${command} -Pn -p ${port} ${host} 2>&1 | ascii-pipe | grep -q -E "${port}/${protocol} open "
 }
 
+

lib/nvm.sh

@@ -92,3 +92,4 @@ is.an-existing-file .nvmrc && {
     nvm.activate
   fi
 }
+

lib/openssl.sh

@@ -29,3 +29,4 @@ function openssl.certs.generate-csr() {
     return 0
 }
 
+

lib/osx.sh

@@ -311,3 +311,4 @@ ssh.servers() { osx.local-servers ssh; }
 afp.servers() { osx.local-servers afp; }
 http.servers() { osx.local-servers http; }
 https.servers() { osx.local-servers https; }
+

lib/output-boxes.sh

@@ -368,3 +368,4 @@ h4.red()    { h4bg "${@}"; }
 hdr() {
   h1 "$@"
 }
+

lib/output-repeat-char.sh

@@ -108,3 +108,4 @@ export LibOutput__RepeatCharImplementation="product"
   local width="${2}"
   printf "%s%d" "${width}" "$(text.ord "${char}")"
 }
+

lib/output-utils.sh

@@ -168,3 +168,4 @@ function dbgf() {
   return ${code}
 }
 
+

lib/output.sh

@@ -646,3 +646,4 @@ ui.closer.kind-of-ok:() {
   ui.closer.kind-of-ok $@
   echo
 }
+

lib/package.sh

@@ -28,3 +28,4 @@ function package.ensure.commmand-available() {
   error "After installing package ${package}, binary ${binary} still is not found."
 }
 
+

lib/path.sh

@@ -181,3 +181,4 @@ function path.absolute() {
       return 127
   fi
 }
+

lib/pdf.sh

@@ -44,3 +44,4 @@ function pdf.combine() {
 
   return ${LibRun__LastExitCode}
 }
+

lib/pg.sh

@@ -27,3 +27,4 @@ pg.server-in-path.version() {
   is.command postgres || return 1
   $(which postgres) -V | sed -E 's/[^0-9.]//g;s/\..*$//g'
 }
+

lib/pids.sh

@@ -331,3 +331,4 @@ pstop() {
 pall() {
   pids.all "$@"
 }
+

lib/pipe.sh

@@ -17,3 +17,4 @@ pipe.remove-hash-comments() {
 pipe.remove-blank-lines() {
   sedx '/^$/D'
 }
+

lib/progress-bar.sh

@@ -159,3 +159,4 @@ progress.bar.configure.symbol-bar() {
   progress.bar.config BarChar="█"
 }
 
+

lib/repositories.sh

@@ -88,3 +88,4 @@ repos.init-interrupt() {
 repos.was-interrupted() {
   [[ ${LibRepo__Interrupted} == true ]]
 }
+

lib/ruby.sh

@@ -497,3 +497,4 @@ alias b="bundle exec"
 alias brake="rbenv exec bundl exec rake"
 alias bcap="rbenv exec bundle exec cap"
 ##——————————————————————————————————————————————————————————————————————————————————
+

lib/run.sh

@@ -96,3 +96,4 @@ run.ui.ask() {
     eval "${func} 1"
   fi
 }
+

lib/runtime-config.sh

@@ -226,3 +226,4 @@ ____run.list-options() {
   #eval ${func} | tr '\n' ',' | sedx 's/,$//g' | sedx "s/,/\\n${prefix}${bldpur}/g"
   echo
 }
+

lib/runtime.sh

@@ -558,3 +558,4 @@ run.on-error.ask-is-enabled() {
 run.was-successful() {
   [[ ${LibRun__LastExitCode} -eq 0 ]]
 }
+

lib/sedx.sh

@@ -56,3 +56,4 @@ function sedx() {
   ${bashmatic__sed_command} -E "$@"
 }
 
+

lib/serial.sh

@@ -49,3 +49,4 @@ function serial.console {
     echo "No USB modem device found in /dev"
   fi
 }
+

lib/set.sh

@@ -30,3 +30,4 @@ set-e-restore() {
   set -o errexit ${status}
   rm -f ${__bash_set_errexit_status} 2>/dev/null
 }
+

lib/settings.sh

@@ -66,3 +66,4 @@ declare -a AppBrewPackages=(
 
 export AppBrewPackages
 export AppDefaultBackupDir='tmp/pgdump'
+

lib/shasum.sh

@@ -121,3 +121,4 @@ function sha() {
   fi
 }
 
+

lib/shdoc.sh

@@ -12,3 +12,4 @@ function gawk.install() {
   local gawk_path="$(command -v gawk 2>/dev/null)"
   [[ -n "${gawk_path}" && -x "${gawk_path}" ]] || brew.install.package gawk
 }
+

lib/shell-set.sh

@@ -98,3 +98,4 @@ save-set-x() { shell-set.push-stack x; }
 save-restore-x() { shell-set.pop-stack x; }
 
 [[ -z "${SetOptsStack[*]}" ]] && shell-set.init-stack
+

lib/ssh.sh

@@ -71,3 +71,4 @@ function ssh.keys.generate() {
   run "ssh-keygen -t rsa -b 4096 -C ${email}"
 }
 
+

lib/subshell.sh

@@ -101,3 +101,4 @@ function bashmatic.run-if-subshell() {
     return 1
   fi
 }
+

lib/sym.sh

@@ -216,3 +216,4 @@ decrypt.secrets() {
     exit ${code}
   }
 }
+

lib/text.sh

@@ -49,4 +49,4 @@ text.ord() {
 text.chr() {
   [ "$1" -lt 256 ] || return 1
   printf "\\$(printf '%03o' "$1")"
-}
+}