diff options
| -rwxr-xr-x | bin/ak-gpg | 2 | ||||
| -rwxr-xr-x | bin/ak-mine | 2 | ||||
| -rwxr-xr-x | lib/_ak_zchain | 10 | ||||
| -rwxr-xr-x | modules/mixtapes/lib.sh | 4 | ||||
| -rwxr-xr-x | modules/news/lib.sh | 8 |
5 files changed, 12 insertions, 14 deletions
@@ -61,7 +61,7 @@ if [ ! -z $1 ]; then --list-secret-keys-plain | -lsp) _ak_gpg_list_secret_keys_plain; exit;; --create-key | -c) _ak_gpg_create_key $2; exit;; --select-key | -s) _ak_gpg_select_key; exit;; - --delete-key | -d) _ak_gpg_delete_key; exit;; + --delete-key | -s) _ak_gpg_delete_key; exit;; * ) _ak_usage;; esac else _ak_usage diff --git a/bin/ak-mine b/bin/ak-mine index bf0eef7..ee1628a 100755 --- a/bin/ak-mine +++ b/bin/ak-mine @@ -20,7 +20,7 @@ gather_zblocks(){ proofofwork(){ TEST="$(gather_zblocks)" MINER="$(ak-gpg --get-key-self-as-ipfs)" - PRE="$(ak schain --get-latest | jq -r '.latest_block' | tr -d $'\n')" + PRE="$(ak-schain --get-latest | jq -r '.latest_block' | tr -d $'\n')" i=1 l=1; while [ $l = 1 ] do diff --git a/lib/_ak_zchain b/lib/_ak_zchain index c809b5d..dd9400c 100755 --- a/lib/_ak_zchain +++ b/lib/_ak_zchain @@ -81,18 +81,18 @@ _ak_zchain_rebase(){ _ak_zchain_extract_cids(){ if [ ! -z $1 ] && [ -n "$1" ] then - ak zchain --crawl $1 | jq -M | grep Qm | sed -e 's/".*"://g; s/ //g; s/[{,"]//g' | sort | uniq + _ak_zchain_crawl $1 | jq -M | grep Qm | sed -e 's/".*"://g; s/ //g; s/[{,"]//g' | sort | uniq else - ak zchain --crawl | jq -M | grep Qm | sed -e 's/".*"://g; s/ //g; s/[{,"]//g' | sort | uniq + _ak_zchain_crawl | jq -M | grep Qm | sed -e 's/".*"://g; s/ //g; s/[{,"]//g' | sort | uniq fi } _ak_zchain_extract_data_cids(){ if [ ! -z $1 ] then - ak zchain --crawl $1 | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g' + _ak_zchain_crawl $1 | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g' else - ak zchain --crawl | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g' + _ak_zchain_crawl | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g' fi } @@ -223,12 +223,10 @@ _ak_zchain_crawl_self(){ _ak_zchain_crawl_remote_ipfs(){ _ak_zchain_crawl $1 - #ak enter $1 } _ak_zchain_crawl_remote_ipns(){ _ak_zchain_crawl -n $1 - #ak enter -n $1 } _ak_zchain_get_latest(){ diff --git a/modules/mixtapes/lib.sh b/modules/mixtapes/lib.sh index 4738a35..04551e0 100755 --- a/modules/mixtapes/lib.sh +++ b/modules/mixtapes/lib.sh @@ -60,9 +60,9 @@ _ak_modules_mixtapes_get_local_latest(){ cd $tempdir if [ -z "$1" ] then - ak zchain --crawl -l 1 | jq > aktempzblock + _ak_zchain_crawl -l 1 | jq > aktempzblock else - ak zchain --crawl -l 1 $1 | jq > aktempzblock + _ak_zchain_crawl -l 1 $1 | jq > aktempzblock fi curzblock="`cat aktempzblock | jq -r '.[].zblock'`" curaction="`cat aktempzblock | jq -r '.[].action'`" diff --git a/modules/news/lib.sh b/modules/news/lib.sh index 0cb0d81..35ff807 100755 --- a/modules/news/lib.sh +++ b/modules/news/lib.sh @@ -168,7 +168,7 @@ _ak_modules_news_read(){ exit 0 fi - ak zchain --crawl -l 1 $1 > temp + _ak_zchain_crawl -l 1 $1 > temp if [ $? -ne 0 ] then echo error @@ -192,7 +192,7 @@ _ak_modules_news_read(){ } _ak_modules_news_html(){ - ak zchain --crawl -l 1 $1 > temp + _ak_zchain_crawl -l 1 $1 > temp if [ $? -ne 0 ] then _ak_log_error "Failed to retrieve zblock $1" @@ -287,9 +287,9 @@ _ak_modules_news_read_latest_local_news(){ cd $TEMP if [ -z "$1" ] then - ak zchain --crawl -l 1 | jq > aktempzblock + _ak_zchain_crawl -l 1 | jq > aktempzblock else - ak zchain --crawl -l 1 $1 | jq > aktempzblock + _ak_zchain_crawl -l 1 $1 | jq > aktempzblock fi curzblock="`cat aktempzblock | jq -r '.[].zblock'`" |