diff options
68 files changed, 666 insertions, 187 deletions
@@ -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 @@ -153,7 +154,7 @@ case "$1" in _ak_exit_program $? "$subcmd module finished"; ;; -s|--shell) - ak sh -s + rlwrap ak sh -s _ak_exit_program $? "Shell terminated"; ;; esac 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 @@ -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" @@ -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 ] @@ -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(){ @@ -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(){ @@ -48,6 +49,7 @@ if [ ! -z $1 ]; then case $1 in -h | --help) _ak_usage; exit;; -f | --follow) _ak_log_follow; exit;; + -l | --last) _ak_log_last_line; exit;; -g | --grep) _ak_log_grep; exit;; -m | --message) shift; _ak_log_message $*; exit;; -r | --rotate) _ak_log_rotate; exit;; 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..72f90a3 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_datetime 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-ns b/bin/ak-ns new file mode 100755 index 0000000..f638e07 --- /dev/null +++ b/bin/ak-ns @@ -0,0 +1,61 @@ +#!/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/>. +### +## +## AKNS is a name system for Arching Kaos +## +## Usage: +## +## -h, --help Prints this help message +## -c, --create <name> Creates a new key-pair with name +## -l, --list List names +## -ll, --list-long List names with keys +## -rn, --resolve-name <name> Resolves value from name +## -rk, --resolve-key <key> Resolves value from key +## -p, --publish <key> <value> Publishes value to key +## -pn, --publish2name <name> <value> Publishes value to name +## -pz, --publish-zchain Publishes zchain +## -pc, --publish-config Publishes config +## +fullprogrampath="$(realpath $0)" +PROGRAM=$(basename $0) +descriptionString="Name system" + +source $AK_LIBDIR/_ak_lib_load +_ak_lib_load _ak_log +_ak_lib_load _ak_script +_ak_lib_load _ak_ns + +if [ ! -z $1 ] +then + case $1 in + -h | --help) _ak_usage; exit;; + -c | --create) shift; _ak_ns_create $1; exit;; + -l | --list) shift; _ak_ns_list; exit;; + -ll | --list-long) shift; _ak_ns_list_long; exit;; + -rn | --resolve-name) shift; _ak_ns_resolve_from_name $1; exit;; + -rk | --resolve-key) shift; _ak_ns_resolve_from_key $1; exit;; + -p | --publish) shift; _ak_ns_publish $1 $2; exit;; + -pn | --publish2name) shift; _ak_ns_publish2name $1 $2; exit;; + -pz | --publish-zchain) _ak_ns_publish_zchain; exit;; + -pc | --publish-config) _ak_ns_publish_config; exit;; + * ) _ak_usage;; + esac +else _ak_usage +fi @@ -26,6 +26,7 @@ ## -h, --help Prints this help message ## --make-releases-from-local Makes releases from all local installation's module ## --make-release-from-local Makes release from a local installation's module +## --make-release-from-directory Makes release from a local directory ## --install-from-zblock <zblock> Installs from a zblock ## --install-from-akfs <maphash> Installs from an AKFS map ## --uninstall Uninstalls a module selected from a menu @@ -35,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 @@ -47,6 +49,7 @@ then -h | --help) _ak_usage; exit;; --make-releases-from-local) shift; _ak_pkg_all_modules_make_releases_from_local_installation; exit;; --make-release-from-local) _ak_pkg_all_modules_make_release_from_local_installation $1; exit;; + --make-release-from-directory) shift; _ak_pkg_all_modules_make_release_from_local_directory $1; exit;; --install-from-zblock) shift; _ak_pkg_install_from_zblock $1; exit;; --install-from-akfs) shift; _ak_pkg_install_from_akfsmap $1; exit;; --uninstall) _ak_pkg_uninstall; exit;; diff --git a/bin/ak-profile b/bin/ak-profile index 4232b55..02ed5a7 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_datetime +_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 @@ -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_st |