aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rwxr-xr-xlib/_ak_checks4
-rwxr-xr-xlib/_ak_cjdns7
-rwxr-xr-xlib/_ak_coin2
-rwxr-xr-xlib/_ak_config4
-rwxr-xr-xlib/_ak_datetime (renamed from lib/_ak_utils)1
-rwxr-xr-xlib/_ak_fm6
-rwxr-xr-xlib/_ak_fs7
-rwxr-xr-xlib/_ak_gpg20
-rwxr-xr-xlib/_ak_hash_exchange8
-rwxr-xr-xlib/_ak_html5
-rwxr-xr-xlib/_ak_ipfs6
-rwxr-xr-xlib/_ak_irc10
-rwxr-xr-xlib/_ak_lib_load32
-rwxr-xr-xlib/_ak_log9
-rwxr-xr-xlib/_ak_maintainance5
-rwxr-xr-xlib/_ak_network15
-rwxr-xr-xlib/_ak_network_cjdns5
-rwxr-xr-xlib/_ak_network_incoming11
-rwxr-xr-xlib/_ak_network_ipfs11
-rwxr-xr-xlib/_ak_network_stellar9
-rwxr-xr-xlib/_ak_network_utils6
-rwxr-xr-xlib/_ak_network_yggdrasil7
-rwxr-xr-xlib/_ak_node6
-rwxr-xr-xlib/_ak_ns202
-rwxr-xr-xlib/_ak_pkg66
-rwxr-xr-xlib/_ak_sblock6
-rwxr-xr-xlib/_ak_schain2
-rwxr-xr-xlib/_ak_script5
-rwxr-xr-xlib/_ak_settings9
-rwxr-xr-xlib/_ak_sh6
-rwxr-xr-xlib/_ak_smfiles5
-rwxr-xr-xlib/_ak_wallet2
-rwxr-xr-xlib/_ak_yggdrasil8
-rwxr-xr-xlib/_ak_zblock17
-rwxr-xr-xlib/_ak_zchain15
35 files changed, 464 insertions, 75 deletions
diff --git a/lib/_ak_checks b/lib/_ak_checks
index c08863e..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(){
@@ -41,3 +42,4 @@ function _ak_checks_example_check_for_base64_strings(){
fi
}
+_ak_log_debug "_ak_checks loaded $(caller)"
diff --git a/lib/_ak_cjdns b/lib/_ak_cjdns
index 69e5ffc..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"
@@ -198,3 +199,5 @@ function _ak_cjdns_get_ip(){
awk '{print $2}' | \
cut -d'/' -f1
}
+
+_ak_log_debug "_ak_cjdns loaded $(caller)"
diff --git a/lib/_ak_coin b/lib/_ak_coin
index 4c58e2d..413d575 100755
--- a/lib/_ak_coin
+++ b/lib/_ak_coin
@@ -30,3 +30,5 @@ function _ak_coin_stats(){
echo "Coinbase: $COINBASE"
echo "Genesis: $GENESIS"
}
+
+_ak_log_debug "_ak_coin loaded $(caller)"
diff --git a/lib/_ak_config b/lib/_ak_config
index f8b1460..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
@@ -58,3 +59,4 @@ function _ak_config_published(){
_ak_ipfs_cat $(_ak_node_info_ipfs_hash) | jq
}
+_ak_log_debug "_ak_config loaded $(caller)"
diff --git a/lib/_ak_utils b/lib/_ak_datetime
index 98f6ca0..a25696f 100755
--- a/lib/_ak_utils
+++ b/lib/_ak_datetime
@@ -17,6 +17,7 @@
### You should have received a copy of the GNU General Public License
### along with this program. If not, see <http://www.gnu.org/licenses/>.
###
+
function _ak_datetime_unix(){
date -u +%s | tr -d '\n'
}
diff --git a/lib/_ak_fm b/lib/_ak_fm
index 9947940..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/>.
###
-source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_script
function _ak_fm_remove_line_from_file(){
tempfile="$(_ak_make_temp_file)"
@@ -51,3 +53,5 @@ function _ak_fm_sort_uniq_file(){
_ak_log_info "Sorting $1... Done!"
fi
}
+
+_ak_log_debug "_ak_fm loaded $(caller)"
diff --git a/lib/_ak_fs b/lib/_ak_fs
index a0a49d3..a0f5619 100755
--- a/lib/_ak_fs
+++ b/lib/_ak_fs
@@ -18,8 +18,9 @@
### along with this program. If not, see <http://www.gnu.org/licenses/>.
###
-source $AK_LIBDIR/_ak_log
-source $AK_LIBDIR/_ak_hash_exchange
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_hash_exchange
function _ak_fs_dir_init_setup(){
_ak_check_and_create_dir $AK_MAPSDIR
@@ -759,3 +760,5 @@ function _ak_fs_net_cat_from_map_hash(){
_ak_fs_net_cat `_ak_fs_from_map_net_get_root_hash $1` `_ak_fs_from_map_net_get_original_hash $1`
fi
}
+
+_ak_log_debug "_ak_fs loaded $(caller)"
diff --git a/lib/_ak_gpg b/lib/_ak_gpg
index c8cc669..7832ca1 100755
--- a/lib/_ak_gpg
+++ b/lib/_ak_gpg
@@ -17,10 +17,11 @@
### 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_ipfs
-source $AK_LIBDIR/_ak_config
-source $AK_LIBDIR/_ak_settings
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_ipfs
+_ak_lib_load _ak_config
+_ak_lib_load _ak_settings
export AK_FINGERPRINT="$(_ak_settings_get gpg.fingerprint)"
@@ -133,6 +134,15 @@ function _ak_gpg_sign_clear(){
fi
}
+function _ak_gpg_sign_clear_with_key(){
+ if [ ! -z $1 ] && [ -n "$1" ] && [ ! -z $2 ] && [ -n "$2" ] && [ ! -z $3 ] && [ -n "$3" ]
+ then
+ _ak_gpg --clear-sign --sign-with $3 --armor --output $1 $2
+ else
+ exit 1
+ fi
+}
+
function _ak_gpg_encrypt_sign(){
if [ ! -z $1 ] && [ -n "$1" ] && [ ! -z $2 ] && [ -n "$2" ] && [ ! -z $3 ] && [ -n "$3" ]
then
@@ -299,3 +309,5 @@ function _ak_gpg_delete_secret_key(){
fi
fi
}
+
+_ak_log_debug "_ak_gpg loaded $(caller)"
diff --git a/lib/_ak_hash_exchange b/lib/_ak_hash_exchange
index 2e39658..3751a8e 100755
--- a/lib/_ak_hash_exchange
+++ b/lib/_ak_hash_exchange
@@ -17,8 +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_log
-source $AK_LIBDIR/_ak_fm
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_fm
+
AK_TREEFS="$AK_WORKDIR/tree"
AK_SESSIONSDIR="$AK_WORKDIR/sessions"
@@ -73,3 +75,5 @@ function _ak_he_url_request_map_hash_from_random_peer(){
_ak_he_url_request_map_hash_from_peer "$(_ak_he_select_random_peer)" "$1"
fi
}
+
+_ak_log_debug "_ak_he loaded $(caller)"
diff --git a/lib/_ak_html b/lib/_ak_html
index 491cb6c..281790e 100755
--- a/lib/_ak_html
+++ b/lib/_ak_html
@@ -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_generate_html_header(){
printf '<!DOCTYPE html>\n<html>\n<head>\n'
@@ -305,3 +306,5 @@ function _ak_generate_html_zblock(){
printf ' </table>\n'
fi
}
+
+_ak_log_debug "_ak_html loaded $(caller)"
diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs
index d904645..07595ae 100755
--- a/lib/_ak_ipfs
+++ b/lib/_ak_ipfs
@@ -17,7 +17,9 @@
### 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
+
AK_IPFS_REPO="$AK_WORKDIR/ipfsrepo"
AK_IPFS_ARTIFACTS="$AK_WORKDIR/ipfs_artifacts"
if [ ! -d $AK_IPFS_ARTIFACTS ]
@@ -564,3 +566,5 @@ function _ak_ipfs_swarm_install(){
function _ak_ipfs_get_config_ipns_key(){
_ak_ipfs_key_list_full | grep 'ak-config' | cut -d ' ' -f 1
}
+
+_ak_log_debug "_ak_ipfs loaded $(caller)"
diff --git a/lib/_ak_irc b/lib/_ak_irc
index 17cfd83..85e8bc7 100755
--- a/lib/_ak_irc
+++ b/lib/_ak_irc
@@ -1,8 +1,10 @@
#!/usr/bin/env bash
-
-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
function _ak_irc_connect(){
- _ak_not_implemented "LOL"
+ _ak_not_implemented "${FUNCNAME}"
}
+
+_ak_log_debug "_ak_irc loaded $(caller)"
diff --git a/lib/_ak_lib_load b/lib/_ak_lib_load
new file mode 100755
index 0000000..2790458
--- /dev/null
+++ b/lib/_ak_lib_load
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+###
+### arching-kaos-tools
+### Tools to interact and build an Arching Kaos Infochain
+### Copyright (C) 2021 - 2025 kaotisk
+###
+### This program is free software: you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation, either version 3 of the License, or
+### (at your option) any later version.
+###
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with this program. If not, see <http://www.gnu.org/licenses/>.
+###
+
+function _ak_lib_load(){
+ typeset -F | grep $1 2>/dev/null 1>&2 || if [ -f "$AK_LIBDIR/$1" ]
+ then
+ source $AK_LIBDIR/$1
+ elif [ -f "./lib/$1" ]
+ then
+ source ./lib/$1
+ else
+ printf "Error: Could not load $1 lib"
+ fi
+
+}
diff --git a/lib/_ak_log b/lib/_ak_log
index c45794d..51064e7 100755
--- a/lib/_ak_log
+++ b/lib/_ak_log
@@ -18,7 +18,8 @@
### along with this program. If not, see <http://www.gnu.org/licenses/>.
###
-source $AK_LIBDIR/_ak_utils 2>/dev/null || source ./lib/_ak_utils 2>/dev/null
+source ./lib/_ak_lib_load 2>/dev/null || source $AK_LIBDIR/_ak_lib_load 2>/dev/null
+_ak_lib_load _ak_datetime
export AK_LOGSDIR="$AK_WORKDIR/logs"
export AK_LOGSFILE="$AK_LOGSDIR/log"
@@ -81,6 +82,11 @@ function _ak_log_follow(){
done
}
+function _ak_log_last_line(){
+ p="$(tail -n 1 $AK_LOGSFILE | tr -d '\n')"
+ _ak_log_print_log_line "$p"
+}
+
function _ak_log_grep(){
if [ ! -z $1 ] && [ -n "$1" ]
then
@@ -190,4 +196,5 @@ function _ak_log_info(){
_ak_log_message "$PROGRAM" "INFO" "$*"
}
+# _ak_log_debug "_ak_log loaded $(caller)"
# vim: set syntax=bash
diff --git a/lib/_ak_maintainance b/lib/_ak_maintainance
index 030060e..ab8d9da 100755
--- a/lib/_ak_maintainance
+++ b/lib/_ak_maintainance
@@ -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_maintainance_backup(){
if [ -n "${AK_WORKDIR}" ] && [ -d "${AK_WORKDIR}" ]
@@ -81,3 +82,5 @@ function _ak_maintainance_nuke_all_but_core(){
_ak_log_error "No AK_WORKDIR found or it does not exist"
fi
}
+
+_ak_log_debug "_ak_maintainance loaded $(caller)"
diff --git a/lib/_ak_network b/lib/_ak_network
index a7ef4fc..c6d048e 100755
--- a/lib/_ak_network
+++ b/lib/_ak_network
@@ -17,12 +17,13 @@
### 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_network_ipfs
-source $AK_LIBDIR/_ak_network_cjdns
-source $AK_LIBDIR/_ak_network_yggdrasil
-source $AK_LIBDIR/_ak_network_stellar
-source $AK_LIBDIR/_ak_network_incoming
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_network_ipfs
+_ak_lib_load _ak_network_cjdns
+_ak_lib_load _ak_network_yggdrasil
+_ak_lib_load _ak_network_stellar
+_ak_lib_load _ak_network_incoming
function _ak_network_scan(){
if [ ! -z $1 ] && [ -n "$1" ]
@@ -75,3 +76,5 @@ function _ak_network_connect(){
_ak_network_ipfs_connect_bootstrap
fi
}
+
+_ak_log_debug "_ak_network loaded $(caller)"
diff --git a/lib/_ak_network_cjdns b/lib/_ak_network_cjdns
index 31c587b..9a75690 100755
--- a/lib/_ak_network_cjdns
+++ b/lib/_ak_network_cjdns
@@ -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
cjdnstoolspath="$HOME/cjdns/tools"
@@ -212,3 +213,5 @@ function _ak_network_cjdns_connect(){
function _ak_network_cjdns_connect_bootstrap(){
_ak_network_cjdns_connect
}
+
+_ak_log_debug "_ak_network_cjdns loaded $(caller)"
diff --git a/lib/_ak_network_incoming b/lib/_ak_network_incoming
index 439dfa2..12384a3 100755
--- a/lib/_ak_network_incoming
+++ b/lib/_ak_network_incoming
@@ -17,10 +17,11 @@
### 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_utils
-source $AK_LIBDIR/_ak_network_utils
-source $AK_LIBDIR/_ak_fm
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_datetime
+_ak_lib_load _ak_network_utils
+_ak_lib_load _ak_fm
export AK_ZPEERSINCOMING=$AK_ZPEERSDIR/incomingRequests
@@ -90,3 +91,5 @@ function _ak_network_incoming_scan(){
fi
fi
}
+
+_ak_log_debug "_ak_network_incoming loaded $(caller)"
diff --git a/lib/_ak_network_ipfs b/lib/_ak_network_ipfs
index da52d12..172794f 100755
--- a/lib/_ak_network_ipfs
+++ b/lib/_ak_network_ipfs
@@ -17,15 +17,16 @@
### 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_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_ipfs
function _ak_network_ipfs_scan(){
- _ak_not_implemented _ak_network_ipfs_scan
+ _ak_not_implemented ${FUNCNAME}
}
function _ak_network_ipfs_show_peers(){
- _ak_not_implemented _ak_network_ipfs_show_peers
+ _ak_not_implemented ${FUNCNAME}
}
function _ak_network_ipfs_connect_bootstrap(){
@@ -34,3 +35,5 @@ function _ak_network_ipfs_connect_bootstrap(){
_ak_ipfs_swarm_connect "$peer"
done
}
+
+_ak_log_debug "_ak_network_ipfs loaded $(caller)"
diff --git a/lib/_ak_network_stellar b/lib/_ak_network_stellar
index 5d739ec..d4fffcf 100755
--- a/lib/_ak_network_stellar
+++ b/lib/_ak_network_stellar
@@ -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_log
-source $AK_LIBDIR/_ak_ipfs
-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_ipfs
stellarPeersDir="$AK_ZPEERSDIR/stellar"
_ak_check_and_create_dir $stellarPeersDir
@@ -158,3 +159,5 @@ function _ak_network_stellar_show_peers(){
_ak_log_debug "No stellar peers found"
fi
}
+
+_ak_log_debug "_ak_network_stellar loaded $(caller)"
diff --git a/lib/_ak_network_utils b/lib/_ak_network_utils
index bef7936..d3689fe 100755
--- a/lib/_ak_network_utils
+++ b/lib/_ak_network_utils
@@ -17,8 +17,9 @@
### 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_utils
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_datetime
##
# Copied from http://y.yggdrasil-network.ca/yia/crawler/crawler-yia.sh made by
@@ -77,3 +78,4 @@ function _ak_network_utils_pad_ip() { #Pad IP - fill in missing zeros
return
}
+_ak_log_debug "_ak_network_utils loaded $(caller)"
diff --git a/lib/_ak_network_yggdrasil b/lib/_ak_network_yggdrasil
index 4d365ff..afabe70 100755
--- a/lib/_ak_network_yggdrasil
+++ b/lib/_ak_network_yggdrasil
@@ -17,8 +17,9 @@
### 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_utils
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_datetime
function _ak_network_yggdrasil_scan_full(){
# This scan is using HIA resources to scan the whole cjdns network for peers
@@ -114,3 +115,5 @@ function _ak_network_yggdrasil_scan(){
_ak_network_yggdrasil_scan_full
fi
}
+
+_ak_log_debug "_ak_network_yggdrasil loaded $(caller)"
diff --git a/lib/_ak_node b/lib/_ak_node
index 37d8a00..5ca8521 100755
--- a/lib/_ak_node
+++ b/lib/_ak_node
@@ -17,7 +17,9 @@
### 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_ipfs
+source $AK_LIBDIR/_ak_lib_load
+_ak_lib_load _ak_log
+_ak_lib_load _ak_ipfs
# Resolves the IPNS key "ak-config" to its current IPFS value
# Return IPFS CIDv0 without /ipfs/ prefix
@@ -30,3 +32,5 @@ function _ak_node_info_ipfs_hash(){
function _ak_node_info_ipns_key(){
_ak_ipfs_key_list_full | grep 'ak-config' | awk '{print $1}'
}
+
+_ak_log_debug "_ak_node loaded $(caller)"
diff --git a/lib/_ak_ns b/lib/_ak_ns
new file mode 100755
index 0000000..683f572
--- /dev/null
+++ b/lib/_ak_ns
@@ -0,0 +1,202 @@
+#!/usr/bin/env bash
+###
+### arching-kaos-tools
+### Tools to interact and build an Arching Kaos Infochain
+### Copyright (C) 2021 - 2025 kaotisk
+###
+### This program is free software: you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation, either version 3 of the License, or
+### (at your option) any later version.
+###
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+### GNU General Public License for more details.
+###
+### 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_script
+_ak_lib_load _ak_gpg
+_ak_lib_load _ak_zchain
+
+AK_NS_DIR="${AK_WORKDIR}/akns"
+
+_ak_check_and_create_dir ${AK_NS_DIR}
+
+function _ak_ns_create(){
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No key name was given"
+ exit 1
+ fi
+ if [ "$(echo -n $1| tr -d '[:alnum:]')" != "" ]
+ then
+ _ak_log_error "Name $1 is not allowed. Use only letters and numbers"
+ exit 1
+ fi
+ keyname="$1@keynames.kaos.kaos"
+ _ak_log_info "Checking for ${keyname}..."
+ _ak_gpg_list_secret_keys_long | grep ${keyname} > /dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ _ak_log_info "Creating ${keyname}"
+ _ak_gpg_create_key ${keyname}
+ else
+ _ak_log_error "Name ${keyname} already exists"
+ exit 1
+ fi
+}
+
+function _ak_ns_list(){
+ _ak_gpg_list_secret_keys_long | grep '@keynames.kaos.kaos' | cut -d ' ' -f 2
+}
+
+function _ak_ns_list_long(){
+ _ak_gpg_list_secret_keys_long | grep '@keynames.kaos.kaos'
+}
+
+function _ak_ns_resolve_from_key(){
+ # $1; exit;;
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No key was given"
+ exit 1
+ fi
+ key="$1"
+ _ak_log_info "${key} was given"
+ if [ ! -f ${AK_NS_DIR}/${key} ]
+ then
+ _ak_log_error "${key} was not found"
+ exit 1
+ fi
+ _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key}
+}
+
+function _ak_ns_resolve_from_name(){
+ # $1; exit;;
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No name was given"
+ exit 1
+ fi
+ key_name="$1"
+ _ak_log_info "${key_name} was given"
+ if [ "${key_name}" == "zchain" ] || [ "${key_name}" == "zconfig" ]
+ then
+ _ak_log_info "${key_name} search on local secret keychain"
+ key="$(_ak_gpg_list_secret_keys_long | grep ${key_name}'@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ if [ ! -n "${key}" ]
+ then
+ _ak_log_error "${key_name} was not found locally"
+ exit 1
+ fi
+ _ak_ns_resolve_from_key ${key}
+ fi
+}
+
+function _ak_ns_publish(){
+ # $1 $2; exit;;
+ _ak_not_implemented "${FUNCNAME}"
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No key was given"
+ exit 1
+ fi
+ if [ ! -z $2 ] || [ ! -n "$2" ]
+ then
+ _ak_log_error "No value was given"
+ exit 1
+ fi
+ if [ "$(echo -n $1| sed -e 's/[A-F0-9]\{40\}//')" != "" ]
+ then
+ _ak_log_error "$1 is not a valid key"
+ exit 1
+ fi
+ if [ "$(echo -n $2| sed -e 's/[a-f0-9]\{128\}//')" != "" ]
+ then
+ _ak_log_error "$2 is not a valid hash"
+ exit 1
+ fi
+ key="$(_ak_gpg_list_secret_keys | grep $1)"
+ value="$2"
+ if [ ! -n "${key}" ]
+ then
+ _ak_log_error "Key $1 was not found"
+ exit 1
+ fi
+ _ak_log_info "Key $1 was found"
+ if [ ! -z $2 ] || [ -n "$2" ]
+ then
+ _ak_gpg_sign_clear_with_key $key
+ fi
+}
+
+function _ak_ns_publish2name(){
+ # $1 $2; exit;;
+ _ak_not_implemented "${FUNCNAME}"
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No key name was given"
+ exit 1
+ fi
+ if [ "$(echo -n $1| tr -d '[:alnum:]')" != "" ]
+ then
+ _ak_log_error "Name $1 is not allowed. Use only letters and numbers"
+ exit 1
+ fi
+ key="$(_ak_gpg_list_secret_keys_long | grep $1'@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ if [ ! -n "${key}" ]
+ then
+ _ak_log_error "No key found with name $1"
+ exit 1
+ fi
+ _ak_ns_publish ${key} $2
+}
+
+function _ak_ns_publish_zchain(){
+ zlatest="$(_ak_zchain_get_latest)"
+ zchain_key="$(_ak_gpg_list_secret_keys_long | grep 'zchain@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ if [ ! -n "${zchain_key}" ]
+ then
+ _ak_log_warning "zchain_key not there"
+ _ak_log_info "Creating zchain_key"
+ _ak_ns_create zchain
+ fi
+ zchain_key="$(_ak_gpg_list_secret_keys_long | grep 'zchain@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ zlatest_file="$(_ak_make_temp_file)"
+ echo -n ${zlatest} > ${zlatest_file}
+ zlatest_csigned_file="$(_ak_make_temp_file)"
+ _ak_gpg_sign_clear_with_key ${zlatest_csigned_file} ${zlatest_file} ${zchain_key}
+ if [ -f ${AK_NS_DIR}/${zchain_key} ]
+ then
+ _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${zchain_key} >> ${AK_NS_DIR}/${zchain_key}.history
+ fi
+ mv ${zlatest_csigned_file} ${AK_NS_DIR}/${zchain_key}
+}
+
+function _ak_ns_publish_config(){
+ zconfig="$(_ak_node_info_ipfs_hash)"
+ zconfig_key="$(_ak_gpg_list_secret_keys_long | grep 'zconfig@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ if [ ! -n "${zconfig_key}" ]
+ then
+ _ak_log_warning "zconfig_key not there"
+ _ak_log_info "Creating zconfig_key"
+ _ak_ns_create zconfig
+ fi
+ zconfig_key="$(_ak_gpg_list_secret_keys_long | grep 'zconfig@keynames.kaos.kaos' | cut -d ' ' -f 1)"
+ zconfig_file="$(_ak_make_temp_file)"
+ echo -n ${zconfig} > ${zconfig_file}
+ zconfig_csigned_file="$(_ak_make_temp_file)"
+ _ak_gpg_sign_clear_with_key ${zconfig_csigned_file} ${zconfig_file} ${zconfig_key}
+ if [ -f ${AK_NS_DIR}/${zconfig_key} ]
+ then
+ _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${zconfig_key} >> ${AK_NS_DIR}/${zconfig_key}.history
+ fi
+ mv ${zconfig_csigned_file} ${AK_NS_DIR}/${zconfig_key}
+}
+
+_ak_log_debug "_ak_ns loaded $(caller)"
diff --git a/lib/_ak_pkg b/lib/_ak_pkg
index 1155acd..e430a50 100755
--- a/lib/_ak_pkg
+++ b/lib/_ak_pkg
@@ -17,12 +17,12 @@
### 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_script
-source $AK_LIBDIR/_ak_fs
-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_fs
+_ak_lib_load _ak_gpg
+_ak_lib_load _ak_zblock
function _ak_pkg_all_modules_make_release_from_local_installation(){
outdir="$(pwd)"
@@ -91,6 +91,58 @@ EOF
done
}
+function _ak_pkg_all_modules_make_release_from_local_directory(){
+ outdir="$(pwd)"
+ if [ ! -z $1 ] && [ -n "$1" ] && [ -d "$1" ]
+ then
+ mod="$(realpath $1)"
+ mod_root="$(echo $mod | rev | cut -d '/' -f 2- | rev)"
+ mod_name="$(basename $mod)"
+ cd ${mod_root}/${mod_name}
+ if [ ! -f version ]
+ then
+ echo -n 'v0.0.0' > version
+ fi
+ mod_version="$(cat version)"
+ outfile="${mod_name}-${mod_version}.tar.gz"
+ fout="${outdir}/${outfile}"
+ if [ ! -f ${fout} ]
+ then
+ tar cfz ${fout} *
+ cd ${outdir}
+ _ak_gpg_sign_detached ${outfile}.asc ${outfile}
+ akfsmap="$(_ak_fs_import ${outfile})"
+ akfsmapsig="$(_ak_fs_import ${outfile}.asc)"
+ cat > data << EOF
+{
+ "package":"$mod_name",
+ "version":"$mod_version",
+ "akfsmap":"$akfsmap",
+ "detach":"$akfsmapsig"
+}
+EOF
+ _ak_zblock_pack pkg/add data
+ else
+ tfile="$(_ak_make_temp_file).tar.gz"
+ tar cfz ${tfile} *
+ hasht="$(sha512sum ${tfile} | cut -d ' ' -f 1)"
+ hashf="$(sha512sum ${fout} | cut -d ' '