From d7b8fdd55854d880b97c6946e6d3bb4edc3261bb Mon Sep 17 00:00:00 2001
From: Thomas <me@jfx.ac>
Date: Fri, 3 Mar 2023 13:09:59 +1100
Subject: [PATCH 1/2] scripts/build: filter out private functions

---
 aliases       | 20 --------------------
 functions     | 20 --------------------
 scripts/build |  2 +-
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/aliases b/aliases
index ba4eea3d..4fa8c1b4 100644
--- a/aliases
+++ b/aliases
@@ -1,26 +1,6 @@
 # DO NOT MANUALLY MODIFY THIS FILE.
 # Use 'scripts/build' to regenerate if required.
 
-alias __bma-using-aws-cli-v1='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma-using-aws-cli-v1'
-alias __bma_error='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_error'
-alias __bma_read_filters='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_read_filters'
-alias __bma_read_filters-az='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_read_filters-az'
-alias __bma_read_inputs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_read_inputs'
-alias __bma_read_stdin='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_read_stdin'
-alias __bma_usage='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma __bma_usage'
-alias _bma_derive_params_from_stack_and_template='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_params_from_stack_and_template'
-alias _bma_derive_params_from_template='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_params_from_template'
-alias _bma_derive_stack_from_params='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_stack_from_params'
-alias _bma_derive_stack_from_template='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_stack_from_template'
-alias _bma_derive_template_from_params='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_template_from_params'
-alias _bma_derive_template_from_stack='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_derive_template_from_stack'
-alias _bma_stack_args='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_args'
-alias _bma_stack_capabilities='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_capabilities'
-alias _bma_stack_diff_params='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_diff_params'
-alias _bma_stack_diff_template='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_diff_template'
-alias _bma_stack_name_arg='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_name_arg'
-alias _bma_stack_params_arg='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_params_arg'
-alias _bma_stack_template_arg='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma _bma_stack_template_arg'
 alias ad-app='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ad-app'
 alias ad-app-owners='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ad-app-owners'
 alias ad-apps='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ad-apps'
diff --git a/functions b/functions
index 1abe9de8..0b98102c 100644
--- a/functions
+++ b/functions
@@ -1,26 +1,6 @@
 # DO NOT MANUALLY MODIFY THIS FILE.
 # Use 'scripts/build' to regenerate if required.
 
-__bma-using-aws-cli-v1
-__bma_error
-__bma_read_filters
-__bma_read_filters-az
-__bma_read_inputs
-__bma_read_stdin
-__bma_usage
-_bma_derive_params_from_stack_and_template
-_bma_derive_params_from_template
-_bma_derive_stack_from_params
-_bma_derive_stack_from_template
-_bma_derive_template_from_params
-_bma_derive_template_from_stack
-_bma_stack_args
-_bma_stack_capabilities
-_bma_stack_diff_params
-_bma_stack_diff_template
-_bma_stack_name_arg
-_bma_stack_params_arg
-_bma_stack_template_arg
 ad-app
 ad-app-owners
 ad-apps
diff --git a/scripts/build b/scripts/build
index 54a786b1..37e25bcd 100755
--- a/scripts/build
+++ b/scripts/build
@@ -14,7 +14,7 @@ funcs_before_bma=$(compgen -A function)
 for f in $project_root/lib/*-functions; do source "$f"; done
 
 # all function after loading BMA functions
-funcs_after_bma=$(compgen -A function)
+funcs_after_bma=$(compgen -A function | command grep -v '_bma')
 
 # Generate the functions file
 

From d217e733a8113808afabbec3deb6b9a033e8dd6c Mon Sep 17 00:00:00 2001
From: Thomas <me@jfx.ac>
Date: Fri, 3 Mar 2023 13:31:38 +1100
Subject: [PATCH 2/2] scripts/build: better private function matching

---
 scripts/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build b/scripts/build
index 37e25bcd..d77c27ab 100755
--- a/scripts/build
+++ b/scripts/build
@@ -14,7 +14,7 @@ funcs_before_bma=$(compgen -A function)
 for f in $project_root/lib/*-functions; do source "$f"; done
 
 # all function after loading BMA functions
-funcs_after_bma=$(compgen -A function | command grep -v '_bma')
+funcs_after_bma=$(compgen -A function | command grep -vE '^(_|__)bma')
 
 # Generate the functions file