aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbin/ak-clean2
-rwxr-xr-xbin/ak-get-balances16
-rwxr-xr-xbin/ak-profile14
-rwxr-xr-xbin/ak-startup2
-rwxr-xr-xbin/ak-transactions2
-rwxr-xr-xlib/_ak_ipfs2
-rwxr-xr-xmodules/articles/main.sh8
-rwxr-xr-xmodules/categories/main.sh8
-rwxr-xr-xmodules/comments/main.sh6
-rwxr-xr-xmodules/files/main.sh2
-rwxr-xr-xmodules/folders/main.sh6
-rwxr-xr-xmodules/follow/lib.sh6
-rwxr-xr-xmodules/markdown/lib.sh18
-rwxr-xr-xmodules/mixtapes/lib.sh10
-rwxr-xr-xmodules/news/lib.sh33
-rwxr-xr-xmodules/reference/main.sh8
-rwxr-xr-xmodules/repositories/main.sh16
-rwxr-xr-xmodules/smfiles/lib.sh10
-rwxr-xr-xmodules/todos/main.sh8
19 files changed, 87 insertions, 90 deletions
diff --git a/bin/ak-clean b/bin/ak-clean
index 8e55515..675d34a 100755
--- a/bin/ak-clean
+++ b/bin/ak-clean
@@ -37,7 +37,7 @@ descriptionString="Cleans ak temp files"
source $AK_LIBDIR/_ak_script
-_ak_tmp_cleanup(){
+function _ak_tmp_cleanup(){
ls -1 /tmp/aktmp* > /dev/null 2>&1
if [ $? -ne 0 ]
then
diff --git a/bin/ak-get-balances b/bin/ak-get-balances
index 5b13999..c25d2d1 100755
--- a/bin/ak-get-balances
+++ b/bin/ak-get-balances
@@ -73,7 +73,7 @@ fi
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
-_ak_get_zblocks_from_sblock(){
+function _ak_get_zblocks_from_sblock(){
if [ "$(_ak_sblock_show $1 | jq 'has("zblocks")')" == "true" ]
then
mkdir $1 && cd $1
@@ -85,7 +85,7 @@ _ak_get_zblocks_from_sblock(){
fi
}
-_ak_verify_zblocks_found(){
+function _ak_verify_zblocks_found(){
if [ -d $1 ]
then
cd $1
@@ -119,7 +119,7 @@ _ak_verify_zblocks_found(){
fi
}
-_ak_balances_from_sblock(){
+function _ak_balances_from_sblock(){
if [ -z $1 ] || [ ! -n "$1" ]
then
_ak_log_error "No sblock provided $1"
@@ -155,7 +155,7 @@ _ak_balances_from_sblock(){
fi
}
-_ak_rewards_from_sblock(){
+function _ak_rewards_from_sblock(){
if [ ! -z $1 ] && [ -n "$1" ]
then
CUR_TARGET="$1"
@@ -191,7 +191,7 @@ _ak_rewards_from_sblock(){
fi
}
-_ak_sblock_get_previous(){
+function _ak_sblock_get_previous(){
if [ -z $1 ] || [ ! -n "$1" ]
then
_ak_log_error "No sblock provided !!"
@@ -207,7 +207,7 @@ _ak_sblock_get_previous(){
echo -n $PREVIOUS
}
-_ak_balances_calculate(){
+function _ak_balances_calculate(){
if [ ! -z $1 ] && [ -n "$1" ]
then
_ak_log_info "Calculating balance for $1"
@@ -237,7 +237,7 @@ _ak_balances_calculate(){
fi
}
-_ak_balances_print(){
+function _ak_balances_print(){
if [ ! -z $1 ] && [ -n "$1" ]
then
CUR_TARGET="$1"
@@ -255,7 +255,7 @@ _ak_balances_print(){
fi
}
-_ak_schain_counting_balances(){
+function _ak_schain_counting_balances(){
if [ ! -z $1 ] && [ -n "$1" ]
then
CUR_TARGET="$1"
diff --git a/bin/ak-profile b/bin/ak-profile
index a6ce3c8..4232b55 100755
--- a/bin/ak-profile
+++ b/bin/ak-profile
@@ -67,7 +67,7 @@ cd $ZPROFILEDIR
# The profile settings/configuration is part of the blockchain produced.
# Hence, we need a specific DATA block that actually has the announcement of a
# {"key":"value"} pair.
-_ak_modules_profile_show(){
+function _ak_modules_profile_show(){
if [ ! -z $1 ]
then
_ak_log_info "Working with $1"
@@ -80,7 +80,7 @@ _ak_modules_profile_show(){
# This should retrieve a specific value from our profile otherwise it dumps the
# whole profile values.
-_ak_modules_profile_propget(){
+function _ak_modules_profile_propget(){
if [ ! -z $1 ]
then
if [ ! -f $ZPROFILEDIR/$1 ]
@@ -95,7 +95,7 @@ _ak_modules_profile_propget(){
fi
}
-_ak_modules_profile_propwrite(){
+function _ak_modules_profile_propwrite(){
cat > $ZPROPERTY_FILE << EOF
{
"$ZPROPERTY_KEY":"${ZPROPERTY_VALUE}"
@@ -114,7 +114,7 @@ EOF
fi
}
-_ak_modules_profile_propset(){
+function _ak_modules_profile_propset(){
if [ ! -z $1 ]
then
ZPROPERTY_FILE="$ZPROFILEDIR/$1"
@@ -149,7 +149,7 @@ _ak_modules_profile_propset(){
exit 244
fi
}
-_ak_modules_profile_index(){
+function _ak_modules_profile_index(){
FILES="$(ls -1 $ZPROFILEDIR)"
i=0
echo -n "{"
@@ -168,7 +168,7 @@ _ak_modules_profile_index(){
echo "}"
}
-_ak_modules_profile_import(){
+function _ak_modules_profile_import(){
if [ ! -z $1 ]
then
if [ ! -d $1 ]
@@ -191,7 +191,7 @@ _ak_modules_profile_import(){
}
# Adds a file as a profile/add ACTION on the zchain.
-_ak_modules_profile_add(){
+function _ak_modules_profile_add(){
TEMPASSIN="$(_ak_make_temp_directory)"
cd $TEMPASSIN
if [ -f $ZPROFILEDIR/$1 ]; then
diff --git a/bin/ak-startup b/bin/ak-startup
index 06d313c..ed768e7 100755
--- a/bin/ak-startup
+++ b/bin/ak-startup
@@ -38,7 +38,7 @@ source $AK_LIBDIR/_ak_log
source $AK_LIBDIR/_ak_script
source $AK_LIBDIR/_ak_ipfs
-_ak_start_up_sequence(){
+function _ak_start_up_sequence(){
_ak_ipfs_starter
_ak_log_rotate
diff --git a/bin/ak-transactions b/bin/ak-transactions
index 037dbcf..7881733 100755
--- a/bin/ak-transactions
+++ b/bin/ak-transactions
@@ -31,7 +31,7 @@ source $AK_LIBDIR/_ak_ipfs
source $AK_LIBDIR/_ak_gpg
source $AK_LIBDIR/_ak_zblock
-_ak_modules_transactions_main(){
+function _ak_modules_transactions_main(){
_ak_log_info "$FROM_ADDRESS to $TO_ADDRESS value sent: $AMOUNT"
echo "Select an address to send from:"
select FROM_ADDRESS in $(_ak_gpg_list_secret_keys)
diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs
index c357f07..eb4ee31 100755
--- a/lib/_ak_ipfs
+++ b/lib/_ak_ipfs
@@ -489,7 +489,7 @@ function _ak_ipfs_download(){
fi
}
-_ak_ipfs_install(){
+function _ak_ipfs_install(){
_ak_log_info "Making temp files"
pwd > pwd
mktemp -d > tempassin
diff --git a/modules/articles/main.sh b/modules/articles/main.sh
index 9fa0304..2fc98a5 100755
--- a/modules/articles/main.sh
+++ b/modules/articles/main.sh
@@ -46,7 +46,7 @@ else
_ak_log_info "zarticlesdir found"
fi
-_ak_modules_articles_create(){
+function _ak_modules_articles_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
export ARTICLES_FILE="$(_ak_datetime_human)"
@@ -68,7 +68,7 @@ _ak_modules_articles_create(){
rm -rf $TEMP
}
-_ak_modules_articles_index(){
+function _ak_modules_articles_index(){
FILES="$(ls -1 $ZARTICLESDIR)"
i=0
for FILE in $FILES
@@ -80,7 +80,7 @@ _ak_modules_articles_index(){
done
}
-_ak_modules_articles_import(){
+function _ak_modules_articles_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -103,7 +103,7 @@ _ak_modules_articles_import(){
exit 224
}
-_ak_modules_articles_add(){
+function _ak_modules_articles_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -f $1 ]; then
diff --git a/modules/categories/main.sh b/modules/categories/main.sh
index ebb9e9e..30e84aa 100755
--- a/modules/categories/main.sh
+++ b/modules/categories/main.sh
@@ -44,7 +44,7 @@ else
_ak_log_info "AK_CATEGORIES found"
fi
-_ak_modules_categories_create(){
+function _ak_modules_categories_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
export NEWS_FILE="$(_ak_datetime_human)"
@@ -58,7 +58,7 @@ _ak_modules_categories_create(){
_ak_modules_categories_add $AK_CATEGORIES/$TO_FILE
cd $AK_CATEGORIES
}
-_ak_modules_categories_index(){
+function _ak_modules_categories_index(){
FILES="$(ls -1 $AK_CATEGORIES)"
i=0
for FILE in $FILES
@@ -70,7 +70,7 @@ _ak_modules_categories_index(){
done
}
-_ak_modules_categories_import(){
+function _ak_modules_categories_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -92,7 +92,7 @@ _ak_modules_categories_import(){
fi
exit 224
}
-_ak_modules_categories_add(){
+function _ak_modules_categories_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -f $1 ]; then
diff --git a/modules/comments/main.sh b/modules/comments/main.sh
index c469ba6..a140a68 100755
--- a/modules/comments/main.sh
+++ b/modules/comments/main.sh
@@ -45,7 +45,7 @@ else
_ak_log_info "zcommentsdir found"
fi
-_ak_modules_comments_create(){
+function _ak_modules_comments_create(){
if [ ! -z $1 ]
then
REFER_TO="$1"
@@ -71,7 +71,7 @@ _ak_modules_comments_create(){
fi
}
-_ak_modules_comments_index(){
+function _ak_modules_comments_index(){
FILES="$(ls -1 $ZCOMMENTSDIR)"
i=0
for FILE in $FILES
@@ -83,7 +83,7 @@ _ak_modules_comments_index(){
done
}
-_ak_modules_comments_add(){
+function _ak_modules_comments_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -f "$ZCOMMENTSDIR/$1" ]; then
diff --git a/modules/files/main.sh b/modules/files/main.sh
index 14cda6a..aac9a58 100755
--- a/modules/files/main.sh
+++ b/modules/files/main.sh
@@ -49,7 +49,7 @@ else
_ak_log_info "$ZFILESDIR found!"
fi
-_ak_modules_files_add(){
+function _ak_modules_files_add(){
CRP="$(pwd)"
FILENAME="$1"
main $FILENAME $CRP
diff --git a/modules/folders/main.sh b/modules/folders/main.sh
index 345a0b1..9350eec 100755
--- a/modules/folders/main.sh
+++ b/modules/folders/main.sh
@@ -46,14 +46,14 @@ TEMPASSIN="$(_ak_make_temp_directory)"
cd $TEMPASSIN
-_ak_modules_folders_add(){
+function _ak_modules_folders_add(){
CRP="$(pwd)"
FOLDERNAME="$1"
_ak_modules_folders_main $FOLDERNAME $CRP
cat data | jq -M
}
-_ak_modules_folders_main(){
+function _ak_modules_folders_main(){
FOLDERNAME="$1"
CRP="$2"
echo "Adding $FOLDERNAME"
@@ -92,7 +92,7 @@ _ak_modules_folders_main(){
fi
}
-_ak_modules_folders_title(){
+function _ak_modules_folders_title(){
echo "$PROGRAM - Folder block creator"
}
diff --git a/modules/follow/lib.sh b/modules/follow/lib.sh
index 885331e..14cfab7 100755
--- a/modules/follow/lib.sh
+++ b/modules/follow/lib.sh
@@ -22,7 +22,7 @@ source $AK_LIBDIR/_ak_ipfs
FOLLOWING="$AK_WORKDIR/following"
-_ak_follow_follow(){
+function _ak_follow_follow(){
if [ ! -z $1 ]
then
grep $1 $FOLLOWING
@@ -45,7 +45,7 @@ _ak_follow_follow(){
exit 1
}
-_ak_follow_list(){
+function _ak_follow_list(){
if [ -f $FOLLOWING ]
then
cat $FOLLOWING
@@ -56,7 +56,7 @@ _ak_follow_list(){
fi
}
-_ak_follow_unfollow(){
+function _ak_follow_unfollow(){
FOLLOWING="$HOME/.arching-kaos/following"
fentries="$(cat $FOLLOWING)"
if [ ! -z $1 ]
diff --git a/modules/markdown/lib.sh b/modules/markdown/lib.sh
index 2b92657..662143a 100755
--- a/modules/markdown/lib.sh
+++ b/modules/markdown/lib.sh
@@ -41,7 +41,7 @@ fi
cd $ZMARKDOWNDIR
-_ak_modules_markdown_create(){
+function _ak_modules_markdown_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
export MARKDOWN_FILE="$(_ak_datetime_human)"
@@ -56,7 +56,7 @@ _ak_modules_markdown_create(){
rm -rf $TEMP
}
-_ak_modules_markdown_index(){
+function _ak_modules_markdown_index(){
FILES="$(ls -1 $ZMARKDOWNDIR)"
i=0
_ak_zchain_extract_cids | sort | uniq > temp
@@ -78,7 +78,7 @@ _ak_modules_markdown_index(){
rm temp
}
-_ak_modules_markdown_import(){
+function _ak_modules_markdown_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -103,7 +103,7 @@ _ak_modules_markdown_import(){
exit 224
}
-_ak_modules_markdown_add_from_file(){
+function _ak_modules_markdown_add_from_file(){
TEMP="$(_ak_make_temp_directory)"
if [ -f "$1" ]; then
FILE="$(realpath $1)"
@@ -142,7 +142,7 @@ EOF
rm -rf $TEMP
}
-_ak_modules_markdown_add(){
+function _ak_modules_markdown_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ ! -z $1 ] && [ -n "$1" ] && [ -f $ZMARKDOWNDIR/$1 ]
@@ -178,7 +178,7 @@ EOF
fi
}
-_ak_modules_markdown_read(){
+function _ak_modules_markdown_read(){
if [ ! -z $1 ] && [ -n "$1" ] && [ "$1" == "local_latest" ]
then
_ak_modules_markdown_read_latest_local_markdown
@@ -208,7 +208,7 @@ _ak_modules_markdown_read(){
rm temp
}
-_ak_modules_markdown_html(){
+function _ak_modules_markdown_html(){
_ak_zchain_crawl -l 1 $1 > temp
if [ $? -ne 0 ]
then
@@ -285,7 +285,7 @@ _ak_modules_markdown_html(){
rm temp
}
-_ak_modules_markdown_specs(){
+function _ak_modules_markdown_specs(){
datetime_mask=$(printf '^[0-9]\{8\}_[0-9]\{6\}$' | xxd -p)
ipfs_mask=$(printf '^Qm[a-zA-Z0-9]\{44\}$' | xxd -p)
text_mask=$(printf '^[a-zA-Z0-9_\-]\{1,128\}$' | xxd -p)
@@ -299,7 +299,7 @@ _ak_modules_markdown_specs(){
}' | jq
}
-_ak_modules_markdown_read_latest_local_markdown(){
+function _ak_modules_markdown_read_latest_local_markdown(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -z "$1" ]
diff --git a/modules/mixtapes/lib.sh b/modules/mixtapes/lib.sh
index 5e1f3ac..cf8196c 100755
--- a/modules/mixtapes/lib.sh
+++ b/modules/mixtapes/lib.sh
@@ -24,7 +24,7 @@ source $AK_LIBDIR/_ak_gpg
source $AK_LIBDIR/_ak_zblock
# Should return current playlist, current mixtape and seek time on the mixtape
-_ak_modules_mixtapes_find_now(){
+function _ak_modules_mixtapes_find_now(){
current_timestamp="$(_ak_datetime_unix)"
mixtapes_ord=$AK_WORKDIR/mixtapes_ord
if [ ! -d $mixtapes_ord ]
@@ -157,7 +157,7 @@ _ak_modules_mixtapes_find_now(){
done
}
-_ak_modules_mixtapes_specs(){
+function _ak_modules_mixtapes_specs(){
datetime_mask=$(printf '^[0-9]\{8\}_[0-9]\{6\}$' | xxd -p)
ipfs_mask=$(printf '^Qm[a-zA-Z0-9]\{44\}$' | xxd -p)
text_dash_underscore_space_mask=$(printf '^[a-zA-Z0-9][a-zA-Z0-9[:space:]\_]\{1,128\}$' | xxd -p -c 64)
@@ -171,7 +171,7 @@ _ak_modules_mixtapes_specs(){
}' | jq
}
-_ak_modules_mixtapes_add(){
+function _ak_modules_mixtapes_add(){
if [ ! -z $3 ];
then
echo $1
@@ -185,7 +185,7 @@ _ak_modules_mixtapes_add(){
fi
}
-_ak_modules_mixtapes_main(){
+function _ak_modules_mixtapes_main(){
echo $MIXTAPE_FILE "by" $MIXTAPE_ARTIST "named as" $MIXTAPE_TITLE
MIXTAPE_IPFS_HASH=$(_ak_ipfs_add $MIXTAPE_FILE)
@@ -207,7 +207,7 @@ EOF
}
-_ak_modules_mixtapes_get_local_latest(){
+function _ak_modules_mixtapes_get_local_latest(){
tempdir=$(_ak_make_temp_directory)
cd $tempdir
if [ -z "$1" ]
diff --git a/modules/news/lib.sh b/modules/news/lib.sh
index ef35492..aa7b149 100755
--- a/modules/news/lib.sh
+++ b/modules/news/lib.sh
@@ -41,35 +41,32 @@ fi
cd $ZNEWSDIR
-_ak_modules_news_create(){
+function _ak_modules_news_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
- cd
- curpath="$(pwd)"
export NEWS_FILE="$(_ak_datetime_human)"
vi $NEWS_FILE
echo "Renaming..."
TITLE="$(head -n 1 $NEWS_FILE)"
- TO_FILE=$NEWS_FILE-$(echo $TITLE | tr '[:upper:]' '[:lower:]' | sed -e 's/ /\_/g' )
+ TO_FILE=$NEWS_FILE-$(echo $TITLE | tr '[:upper:]' '[:lower:]' | sed -e 's/[[:punct:]]/\_/g;s/ /\_/g' )
IPFS_FILE=$(_ak_ipfs_add $NEWS_FILE)
mv $NEWS_FILE $ZNEWSDIR/$TO_FILE
- sed -i -e 's,Qm.*,'"$IPFS_FILE"',g' $ZNEWSDIR/README
_ak_modules_news_add $TO_FILE
- cd $ZNEWSDIR
- # rm -rf $TEMP
+ cd && rm -rf $TEMP
}
-_ak_modules_news_index(){
+function _ak_modules_news_index(){
FILES="$(ls -1 $ZNEWSDIR)"
+ temp="$(_ak_make_temp_file)"
i=0
- _ak_zchain_extract_cids | sort | uniq > temp
+ _ak_zchain_extract_cids | sort | uniq > $temp
for FILE in $FILES
do
DATE="$(echo $FILE | cut -d - -f 1 | awk '{print $1}')"
TITLE="$(head -n 1 $ZNEWSDIR/$FILE)"
IPFS_HASH="$(ipfs add -nQ $ZNEWSDIR/$FILE)"
ONLINE="offzchain"
- grep "$IPFS_HASH" temp > /dev/null 2>&1
+ grep "$IPFS_HASH" $temp > /dev/null 2>&1
if [ $? -eq 0 ]
then
ONLINE="on-zchain"
@@ -78,10 +75,10 @@ _ak_modules_news_index(){
"$i" "$ONLINE" "$IPFS_HASH" "$DATE" "$TITLE"
let i+=1
done
- rm temp
+ rm $temp
}
-_ak_modules_news_import(){
+function _ak_modules_news_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -106,7 +103,7 @@ _ak_modules_news_import(){
exit 224
}
-_ak_modules_news_add_from_file(){
+function _ak_modules_news_add_from_file(){
TEMP="$(_ak_make_temp_directory)"
if [ -f "$1" ]; then
FILE="$(realpath $1)"
@@ -145,7 +142,7 @@ EOF
rm -rf $TEMP
}
-_ak_modules_news_add(){
+function _ak_modules_news_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -f $ZNEWSDIR/$1 ]; then
@@ -180,7 +177,7 @@ EOF
fi
}
-_ak_modules_news_read(){
+function _ak_modules_news_read(){
if [ ! -z $1 ] && [ -n "$1" ] && [ "$1" == "local_latest" ]
then
_ak_modules_news_read_latest_local_news
@@ -210,7 +207,7 @@ _ak_modules_news_read(){
rm temp
}
-_ak_modules_news_html(){
+function _ak_modules_news_html(){
_ak_zchain_crawl -l 1 $1 > temp
if [ $? -ne 0 ]
then
@@ -287,7 +284,7 @@ _ak_modules_news_html(){
rm temp
}
-_ak_modules_news_specs(){
+function _ak_modules_news_specs(){
datetime_mask=$(printf '^[0-9]\{8\}_[0-9]\{6\}$' | xxd -p)
ipfs_mask=$(printf '^Qm[a-zA-Z0-9]\{44\}$' | xxd -p)
text_mask=$(printf '^[a-zA-Z0-9_\-]\{1,128\}$' | xxd -p)
@@ -301,7 +298,7 @@ _ak_modules_news_specs(){
}' | jq
}
-_ak_modules_news_read_latest_local_news(){
+function _ak_modules_news_read_latest_local_news(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -z "$1" ]
diff --git a/modules/reference/main.sh b/modules/reference/main.sh
index e730830..acfeef8 100755
--- a/modules/reference/main.sh
+++ b/modules/reference/main.sh
@@ -48,7 +48,7 @@ else
_ak_log_info "zreferencesdir found"
fi
-_ak_modules_reference_create(){
+function _ak_modules_reference_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
export REFERENCEFILE="$(_ak_datetime_unix)"
@@ -74,7 +74,7 @@ EOF
cd $ZREFERENCESDIR
}
-_ak_modules_reference_index(){
+function _ak_modules_reference_index(){
FILES="$(ls -1 $ZREFERENCESDIR)"
i=0
for FILE in $FILES
@@ -87,7 +87,7 @@ _ak_modules_reference_index(){
done
}
-_ak_modules_reference_import(){
+function _ak_modules_reference_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -110,7 +110,7 @@ _ak_modules_reference_import(){
exit 224
}
-_ak_modules_reference_add(){
+function _ak_modules_reference_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ ! -f $1 ]; then
diff --git a/modules/repositories/main.sh b/modules/repositories/main.sh
index 8794f59..9ef0375 100755
--- a/modules/repositories/main.sh
+++ b/modules/repositories/main.sh
@@ -26,7 +26,7 @@ REPOSTORE="$HOME/.arching-kaos/repostore"
if [ ! -d $BAREDIR ]; then mkdir $BAREDIR; fi
if [ ! -d $REPODIR ]; then echo "no $REPODIR" && exit; fi
if [ ! -f $REPOSTORE ]; then touch $REPOSTORE; fi
-_ak_modules_repositories_import(){
+function _ak_modules_repositories_import(){
REPOS="$(ls -1 $REPODIR)"
for PROJECT in $REPOS
do
@@ -49,7 +49,7 @@ _ak_modules_repositories_import(){
done
}
-_ak_modules_repositories_update(){
+function _ak_modules_repositories_update(){
if [ ! -z $1 ]
then
USING="$1"
@@ -109,7 +109,7 @@ append-if-needed(){
fi
}
-_ak_modules_repositories_add(){
+function _ak_modules_repositories_add(){
PROJECT="$1"
PROJECTDIR="$REPODIR/$PROJECT"
BAREGITDIR="$BAREDIR/$PROJECT.git"
@@ -136,11 +136,11 @@ _ak_modules_repositories_add(){
fi
}
-_ak_modules_repositories_index(){
+function _ak_modules_repositories_index(){
_ak_ipfs_key_list_full | grep -e '\.git'
}
-set-as-profile(){
+function _ak_modules_repositories_set_as_profile(){
IPFS=$(_ak_ipfs_add $REPOSTORE)
if [ $? == 0 ]
then
@@ -150,16 +150,16 @@ set-as-profile(){
fi
}
-_ak_modules_repositories_publish(){
+function _ak_modules_repositories_publish(){
if [ ! -z $1 ]
then
echo "Filtering for $1..."
index | grep "$1" > $REPOSTORE
- set-as-profile
+ _ak_modules_repositories_set_as_profile
else
echo "Publishing all..."
index > $REPOSTORE
- set-as-profile
+ _ak_modules_repositories_set_as_profile
fi
}
diff --git a/modules/smfiles/lib.sh b/modules/smfiles/lib.sh
index f3418ff..28f892c 100755
--- a/modules/smfiles/lib.sh
+++ b/modules/smfiles/lib.sh
@@ -25,12 +25,12 @@ source $AK_LIBDIR/_ak_zblock
source $AK_LIBDIR/_ak_smfiles
source $AK_LIBDIR/_ak_utils
-_ak_sm_files_add(){
+function _ak_sm_files_add(){
FILENAME="$1"
_ak_sm_files_main $FILENAME $CRD
cat data | jq -M
}
-_ak_sm_files_main(){
+function _ak_sm_files_main(){
FILENAME="$1"
CRP="$2"
@@ -127,11 +127,11 @@ EOF
fi
}
-_ak_sm_files_index(){
+function _ak_sm_files_index(){
tail -n1 $AK_WORKDIR/fmp/* | grep '^[abcdef1234567890]' | awk '{ print $2 }'
}
-_ak_sm_files_ls_mapfiles(){
+function _ak_sm_files_ls_mapfiles(){
cd $AK_WORKDIR/fmp
for f in `find . -type f | sed -e 's/\.\///g'`
do
@@ -142,7 +142,7 @@ _ak_sm_files_ls_mapfiles(){
done
}
-_ak_sm_files_full_index(){
+function _ak_sm_files_full_index(){
tail -n 1 $AK_WORKDIR/fmp/* | grep '^[abcdef1234567890]'
}
diff --git a/modules/todos/main.sh b/modules/todos/main.sh
index 7825cf7..479c3dd 100755
--- a/modules/todos/main.sh
+++ b/modules/todos/main.sh
@@ -49,7 +49,7 @@ else
_ak_log_info "ztodosdir found"
fi
-_ak_modules_todos_create(){
+function _ak_modules_todos_create(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
export TODOS_FILE="$(_ak_datetime_unix)"
@@ -65,7 +65,7 @@ _ak_modules_todos_create(){
# rm -rf $TEMP
}
-_ak_modules_todos_index(){
+function _ak_modules_todos_index(){
FILES="$(ls -1 $ZTODOSDIR)"
i=0
for FILE in $FILES
@@ -77,7 +77,7 @@ _ak_modules_todos_index(){
done
}
-_ak_modules_todos_import(){
+function _ak_modules_todos_import(){
echo "#TODO"
if [ ! -z $1 ]
then
@@ -100,7 +100,7 @@ _ak_modules_todos_import(){
exit 224
}
-_ak_modules_todos_add(){
+function _ak_modules_todos_add(){
TEMP="$(_ak_make_temp_directory)"
cd $TEMP
if [ -f $1 ]; then
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 16:53:25 +0000