Applying optimization

60 files changed, 224 insertions, 168 deletions

diff --git a/bin/ak b/bin/ak
index 3a90484..5724ce2 100755
--- a/bin/ak
+++ b/bin/ak
@@ -45,8 +45,9 @@ PROGRAM="$(basename $0)"
 descriptionString="Arching Kaos CLI"
 
 source $HOME/.arching-kaos/rc
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
 
 if [ $# -eq 0 ]
 then
diff --git a/bin/ak-cjdns b/bin/ak-cjdns
index d61a477..1b2e4c0 100755
--- a/bin/ak-cjdns
+++ b/bin/ak-cjdns
@@ -33,9 +33,10 @@ PROGRAM=$(basename $0)
 descriptionString="cjdns helper"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_cjdns
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_cjdns
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-clean b/bin/ak-clean
index 675d34a..b77e74b 100755
--- a/bin/ak-clean
+++ b/bin/ak-clean
@@ -35,7 +35,8 @@ fullprogrampath="$(realpath $0)"
 PROGRAM="$(basename $0)"
 descriptionString="Cleans ak temp files"
 
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_script
 
 function _ak_tmp_cleanup(){
     ls -1 /tmp/aktmp* > /dev/null 2>&1
diff --git a/bin/ak-coin b/bin/ak-coin
index 0bd7f15..c7478ab 100755
--- a/bin/ak-coin
+++ b/bin/ak-coin
@@ -30,9 +30,10 @@ PROGRAM=$(basename $0)
 descriptionString="Coin status"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_coin
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_coin
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-config b/bin/ak-config
index 4337a2d..770255b 100755
--- a/bin/ak-config
+++ b/bin/ak-config
@@ -30,9 +30,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM="$(basename $0)"
 descriptionString="Arching Kaos Configuration Tool"
 
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_config
-source $AK_LIBDIR/_ak_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_script
+_ak_lib_load _ak_config
+_ak_lib_load _ak_ipfs
 
 if [ ! -z $1 ] && [ -n "$1" ]
 then
diff --git a/bin/ak-fs b/bin/ak-fs
index 84ef3b9..1109539 100755
--- a/bin/ak-fs
+++ b/bin/ak-fs
@@ -36,9 +36,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="AKFS tools"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_fs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_fs
 
 if [ ! -z $1 ]
 then
diff --git a/bin/ak-get-balances b/bin/ak-get-balances
index c25d2d1..f5f57ca 100755
--- a/bin/ak-get-balances
+++ b/bin/ak-get-balances
@@ -28,14 +28,15 @@
 fullprogrampath="$(realpath $0)"
 PROGRAM="$(basename $0)"
 descriptionString="Export balances from schain and zchains"
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_ipfs
-source $AK_LIBDIR/_ak_gpg
-source $AK_LIBDIR/_ak_zchain
-source $AK_LIBDIR/_ak_schain
-source $AK_LIBDIR/_ak_sblock
-source $AK_LIBDIR/_ak_coin
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_ipfs
+_ak_lib_load _ak_gpg
+_ak_lib_load _ak_zchain
+_ak_lib_load _ak_schain
+_ak_lib_load _ak_sblock
+_ak_lib_load _ak_coin
 #set -xe
 AK_DB="$AK_WORKDIR/db"
 
diff --git a/bin/ak-gpg b/bin/ak-gpg
index f84bc71..3acfc0b 100755
--- a/bin/ak-gpg
+++ b/bin/ak-gpg
@@ -51,9 +51,10 @@ PROGRAM=$(basename $0)
 descriptionString="GPG cli tool"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_gpg
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_gpg
 
 
 
diff --git a/bin/ak-ipfs b/bin/ak-ipfs
index 376c3c0..f3ef6da 100755
--- a/bin/ak-ipfs
+++ b/bin/ak-ipfs
@@ -30,9 +30,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="IPFS handler"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_ipfs
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-ipfs-starter b/bin/ak-ipfs-starter
index 8076427..df2791c 100755
--- a/bin/ak-ipfs-starter
+++ b/bin/ak-ipfs-starter
@@ -19,8 +19,9 @@
 ###
 PROGRAM="$(basename $0)"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_ipfs
 
 screen -dmS akipfsd _ak_ipfs_daemon
 if [ $? -ne 0 ]
diff --git a/bin/ak-irc b/bin/ak-irc
index d894158..b2351ce 100755
--- a/bin/ak-irc
+++ b/bin/ak-irc
@@ -29,9 +29,10 @@ PROGRAM=$(basename $0)
 descriptionString="IRC"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_irc
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_irc
 
 # Your stuff here...
 example(){
diff --git a/bin/ak-log b/bin/ak-log
index 543d8ee..0f043dd 100755
--- a/bin/ak-log
+++ b/bin/ak-log
@@ -35,8 +35,9 @@ PROGRAM=$(basename $0)
 descriptionString="Log file handler"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
 
 # Your stuff here...
 example(){
diff --git a/bin/ak-maintainance b/bin/ak-maintainance
index 8490007..e0cd82d 100755
--- a/bin/ak-maintainance
+++ b/bin/ak-maintainance
@@ -33,9 +33,10 @@ PROGRAM=$(basename $0)
 descriptionString="AK Backup"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_maintainance
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_maintainance
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-mempool b/bin/ak-mempool
index a994340..3bd9ca5 100755
--- a/bin/ak-mempool
+++ b/bin/ak-mempool
@@ -29,8 +29,9 @@ PROGRAM=$(basename $0)
 descriptionString="Quick description"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
 # Assumptions:
 # I suppose each ak node is connected to some IP.
 # They also run IPFS.
diff --git a/bin/ak-mine b/bin/ak-mine
index 00c7458..42202d3 100755
--- a/bin/ak-mine
+++ b/bin/ak-mine
@@ -29,9 +29,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Sblock mining"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_utils
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_utils
 
 gather_zblocks(){
     if [ "$(cat $AK_ZBLOCKSFILE | jq -r '.[].zblock' | wc -l)" -ne 0 ]
diff --git a/bin/ak-network b/bin/ak-network
index 9873d12..40efd72 100755
--- a/bin/ak-network
+++ b/bin/ak-network
@@ -37,9 +37,10 @@ PROGRAM=$(basename $0)
 descriptionString="AK Nettool"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_network
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_network
 
 # Flags to run
 if [ ! -z $1 ]; then
diff --git a/bin/ak-node-info b/bin/ak-node-info
index 2b9c458..29eea87 100755
--- a/bin/ak-node-info
+++ b/bin/ak-node-info
@@ -29,9 +29,10 @@
 fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Quick description"
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_node
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_node
 
 if [ ! -z "$1" ]
 then
diff --git a/bin/ak-pkg b/bin/ak-pkg
index e73905d..d01921a 100755
--- a/bin/ak-pkg
+++ b/bin/ak-pkg
@@ -36,9 +36,10 @@ PROGRAM=$(basename $0)
 descriptionString="Package Manager"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_pkg
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_pkg
 
 
 # Flags to run
diff --git a/bin/ak-profile b/bin/ak-profile
index 4232b55..891dbac 100755
--- a/bin/ak-profile
+++ b/bin/ak-profile
@@ -43,12 +43,13 @@ PROGRAM=$(basename $0)
 descriptionString="Profile module"
 ZPROFILEDIR="$AK_WORKDIR/profile"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_utils
-source $AK_LIBDIR/_ak_ipfs
-source $AK_LIBDIR/_ak_gpg
-source $AK_LIBDIR/_ak_zblock
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_utils
+_ak_lib_load _ak_ipfs
+_ak_lib_load _ak_gpg
+_ak_lib_load _ak_zblock
 
 # Whatever the command is, we check if $ZPROFILEDIR is there.
 # If NOT we create it and we change dir there.
diff --git a/bin/ak-sblock b/bin/ak-sblock
index 742b6a9..7c6ab23 100755
--- a/bin/ak-sblock
+++ b/bin/ak-sblock
@@ -30,9 +30,10 @@ PROGRAM=$(basename $0)
 descriptionString="Sblock tools"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_sblock
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_sblock
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-schain b/bin/ak-schain
index 2b5e80a..6efcd56 100755
--- a/bin/ak-schain
+++ b/bin/ak-schain
@@ -32,9 +32,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Schain tools"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_schain
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_schain
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-settings b/bin/ak-settings
index 9465735..cf6b77d 100755
--- a/bin/ak-settings
+++ b/bin/ak-settings
@@ -31,9 +31,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Settings helper program"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_settings
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_settings
 
 if [ ! -z "$AK_SETTINGS" ] && [ -n "$AK_SETTINGS" ]
 then
diff --git a/bin/ak-sh b/bin/ak-sh
index 730c83b..e0b39dd 100755
--- a/bin/ak-sh
+++ b/bin/ak-sh
@@ -29,9 +29,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Arching Kaos Shell"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_sh
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_sh
 
 if [ ! -z $1 ]
 then
diff --git a/bin/ak-startup b/bin/ak-startup
index ed768e7..ce54b79 100755
--- a/bin/ak-startup
+++ b/bin/ak-startup
@@ -34,9 +34,10 @@ descriptionString="AK system starter"
 source $HOME/.arching-kaos/rc
 PATH=$PATH:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:$HOME/bin:$AK_WORKDIR/bin
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_ipfs
 
 function _ak_start_up_sequence(){
     _ak_ipfs_starter
diff --git a/bin/ak-template b/bin/ak-template
index 601a467..b5333be 100755
--- a/bin/ak-template
+++ b/bin/ak-template
@@ -29,8 +29,9 @@ PROGRAM=$(basename $0)
 descriptionString="Quick description"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
 
 # Your stuff here...
 example(){
diff --git a/bin/ak-transactions b/bin/ak-transactions
index 7881733..fe00411 100755
--- a/bin/ak-transactions
+++ b/bin/ak-transactions
@@ -24,12 +24,13 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Transactions module"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_utils
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_ipfs
-source $AK_LIBDIR/_ak_gpg
-source $AK_LIBDIR/_ak_zblock
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_utils
+_ak_lib_load _ak_ipfs
+_ak_lib_load _ak_gpg
+_ak_lib_load _ak_zblock
 
 function _ak_modules_transactions_main(){
     _ak_log_info "$FROM_ADDRESS to $TO_ADDRESS value sent: $AMOUNT"
diff --git a/bin/ak-wallet b/bin/ak-wallet
index 39b38f6..9ed9be9 100755
--- a/bin/ak-wallet
+++ b/bin/ak-wallet
@@ -29,10 +29,11 @@ PROGRAM=$(basename $0)
 descriptionString="Wallet manager"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_wallet
-source $AK_LIBDIR/_ak_coin
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_wallet
+_ak_lib_load _ak_coin
 
 
 # Flags to run
diff --git a/bin/ak-yggdrasil b/bin/ak-yggdrasil
index 62f1073..a133f78 100755
--- a/bin/ak-yggdrasil
+++ b/bin/ak-yggdrasil
@@ -33,9 +33,10 @@ PROGRAM=$(basename $0)
 descriptionString="yggdrasil helper"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_yggdrasil
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_yggdrasil
 
 # Flags to run
 if [ ! -z $1 ]
diff --git a/bin/ak-zblock b/bin/ak-zblock
index 2292cec..7fe5005 100755
--- a/bin/ak-zblock
+++ b/bin/ak-zblock
@@ -38,9 +38,10 @@ PROGRAM=$(basename $0)
 descriptionString="Various zblock operations"
 
 # At least these
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_zblock
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_zblock
 
 # Flags to run
 if [ ! -z $1 ]; then
diff --git a/bin/ak-zchain b/bin/ak-zchain
index abd43b2..2cc8df9 100755
--- a/bin/ak-zchain
+++ b/bin/ak-zchain
@@ -58,9 +58,10 @@ fullprogrampath="$(realpath $0)"
 PROGRAM=$(basename $0)
 descriptionString="Zchain tools"
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_script
-source $AK_LIBDIR/_ak_zchain
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
+_ak_lib_load _ak_zchain
 
 # Flags to run
 if [ ! -z $1 ]; then
diff --git a/lib/_ak_checks b/lib/_ak_checks
index 90b01ad..97b3d8a 100755
--- a/lib/_ak_checks
+++ b/lib/_ak_checks
@@ -17,7 +17,8 @@
 ### You should have received a copy of the GNU General Public License
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
-source $AK_LIBDIR/_ak_log
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
 
 function _ak_checks_example_check_for_base64_strings(){
 
diff --git a/lib/_ak_cjdns b/lib/_ak_cjdns
index 76b39db..51832d3 100755
--- a/lib/_ak_cjdns
+++ b/lib/_ak_cjdns
@@ -17,9 +17,10 @@
 ### You should have received a copy of the GNU General Public License
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_network
 
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_network
 rust_sh_install_url="https://sh.rustup.rs"
 cjdns_src_git_repo_url="https://github.com/cjdelisle/cjdns"
 cjdnstoolspath="$HOME/cjdns/tools"
diff --git a/lib/_ak_config b/lib/_ak_config
index 25a9563..6c71e9c 100755
--- a/lib/_ak_config
+++ b/lib/_ak_config
@@ -17,7 +17,8 @@
 ### You should have received a copy of the GNU General Public License
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
-source $AK_LIBDIR/_ak_node
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_node
 
 function _ak_config_show(){
     # We will be using our public key also to put it in the block later
diff --git a/lib/_ak_datetime b/lib/_ak_datetime
index 8eaca23..9da8cfd 100755
--- a/lib/_ak_datetime
+++ b/lib/_ak_datetime
@@ -18,8 +18,6 @@
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
-source $AK_LIBDIR/_ak_log
-
 function _ak_datetime_unix(){
     date -u +%s | tr -d '\n'
 }
diff --git a/lib/_ak_fm b/lib/_ak_fm
index d77cac7..5971a88 100755
--- a/lib/_ak_fm
+++ b/lib/_ak_fm
@@ -18,7 +18,9 @@
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###