diff options
| -rwxr-xr-x | bin/ak | 18 | ||||
| -rwxr-xr-x | config.sh | 1 | ||||
| -rwxr-xr-x | init.sh | 23 | ||||
| -rwxr-xr-x | install.sh | 1 | ||||
| -rwxr-xr-x | modules/ak-articles (renamed from bin/ak-articles) | 0 | ||||
| -rwxr-xr-x | modules/ak-categories (renamed from bin/ak-categories) | 0 | ||||
| -rwxr-xr-x | modules/ak-comments (renamed from bin/ak-comments) | 0 | ||||
| -rwxr-xr-x | modules/ak-files (renamed from bin/ak-files) | 0 | ||||
| -rwxr-xr-x | modules/ak-folders (renamed from bin/ak-folders) | 0 | ||||
| -rwxr-xr-x | modules/ak-mixtapes (renamed from bin/ak-mixtapes) | 0 | ||||
| -rwxr-xr-x | modules/ak-news (renamed from bin/ak-news) | 3 | ||||
| -rwxr-xr-x | modules/ak-reference (renamed from bin/ak-reference) | 0 | ||||
| -rwxr-xr-x | modules/ak-repositories (renamed from bin/ak-repositories) | 0 | ||||
| -rwxr-xr-x | modules/ak-roadmap (renamed from bin/ak-roadmap) | 0 | ||||
| -rwxr-xr-x | modules/ak-todos (renamed from bin/ak-todos) | 0 | ||||
| -rwxr-xr-x | update.sh | 11 |
16 files changed, 48 insertions, 9 deletions
@@ -52,14 +52,16 @@ fi subcmd="$(echo $* | sed -e 's/ /-/g')" # Add functionality for separate modules directory -# case "$1" in -# -m|--module) -# shift -# subcmd="modules/$(echo $* | sed -e 's/ /-/g')" -# ;; -# esac -# -# echo $subcmd +case "$1" in + -m|--module) + shift + subcmd="$AK_MODULESDIR/$(echo $1 | sed -e 's/ /-/g')" + shift + subargs="$*" + $subcmd $subargs + _ak_exit_program $? "$subcmd module finished"; + ;; +esac if [ -f "$AK_BINDIR/ak-$subcmd" ] then @@ -4,6 +4,7 @@ export AK_WORKDIR="$AK_ROOT/.arching-kaos" export AK_CONFIGDIR="$AK_WORKDIR/config" export AK_BINDIR="$AK_WORKDIR/bin" export AK_LIBDIR="$AK_WORKDIR/lib" +export AK_MODULESDIR="$AK_WORKDIR/modules" export AK_ZBLOCKDIR="$AK_WORKDIR/zblocks" export AK_BLOCKDIR="$AK_WORKDIR/blocks" export AK_DATADIR="$AK_WORKDIR/data" @@ -97,6 +97,7 @@ do printf "\tOK!\n" fi done + # Find libs and create symlinks libfiles=$(ls -1 $(pwd)/lib) for b in $libfiles @@ -118,3 +119,25 @@ do printf "\tOK!\n" fi done +# +# Find modules and create symlinks +modfiles=$(ls -1 $(pwd)/modules) +for m in $modfiles +do + if [ ! -L $AK_MODULESDIR/$m ] + then + printf "Creating symlink to %s..." "$m" + ln -s $(pwd)/modules/$b $AK_MODULESDIR/$m + if [ $? -ne 0 ] + then + if [ -L $AK_MODULESDIR/$m ] + then + printf "\tAlready exists!\n" + exit 1 + fi + printf "\tFailed!\n" + exit 1 + fi + printf "\tOK!\n" + fi +done @@ -147,6 +147,7 @@ fi if [ ! -d $AK_CONFIGDIR ] ; then mkdir $AK_CONFIGDIR ;fi if [ ! -d $AK_BINDIR ]; then mkdir $AK_BINDIR ;fi if [ ! -d $AK_LIBDIR ]; then mkdir $AK_LIBDIR ;fi +if [ ! -d $AK_MODULESDIR ]; then mkdir $AK_MODULESDIR ;fi if [ ! -d $AK_ZBLOCKDIR ]; then mkdir $AK_ZBLOCKDIR ;fi if [ ! -d $AK_BLOCKDIR ]; then mkdir $AK_BLOCKDIR ;fi if [ ! -d $AK_DATADIR ]; then mkdir $AK_DATADIR ;fi diff --git a/bin/ak-articles b/modules/ak-articles index 97a8e8d..97a8e8d 100755 --- a/bin/ak-articles +++ b/modules/ak-articles diff --git a/bin/ak-categories b/modules/ak-categories index c0e1e77..c0e1e77 100755 --- a/bin/ak-categories +++ b/modules/ak-categories diff --git a/bin/ak-comments b/modules/ak-comments index 6193e2f..6193e2f 100755 --- a/bin/ak-comments +++ b/modules/ak-comments diff --git a/bin/ak-files b/modules/ak-files index 73c8219..73c8219 100755 --- a/bin/ak-files +++ b/modules/ak-files diff --git a/bin/ak-folders b/modules/ak-folders index 5aa82c7..5aa82c7 100755 --- a/bin/ak-folders +++ b/modules/ak-folders diff --git a/bin/ak-mixtapes b/modules/ak-mixtapes index 712bb54..712bb54 100755 --- a/bin/ak-mixtapes +++ b/modules/ak-mixtapes diff --git a/bin/ak-news b/modules/ak-news index 5865d15..b015bd6 100755 --- a/bin/ak-news +++ b/modules/ak-news @@ -32,6 +32,7 @@ source $AK_LIBDIR/_ak_script source $AK_LIBDIR/_ak_ipfs source $AK_LIBDIR/_ak_gpg source $AK_LIBDIR/_ak_zblock +source $AK_LIBDIR/_ak_zchain if [ ! -d $ZNEWSDIR ]; then mkdir $ZNEWSDIR @@ -67,7 +68,7 @@ _ak_modules_news_create(){ _ak_modules_news_index(){ FILES="$(ls -1 $ZNEWSDIR)" 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}')" diff --git a/bin/ak-reference b/modules/ak-reference index 157b797..157b797 100755 --- a/bin/ak-reference +++ b/modules/ak-reference diff --git a/bin/ak-repositories b/modules/ak-repositories index ffda701..ffda701 100755 --- a/bin/ak-repositories +++ b/modules/ak-repositories diff --git a/bin/ak-roadmap b/modules/ak-roadmap index a30894a..a30894a 100755 --- a/bin/ak-roadmap +++ b/modules/ak-roadmap diff --git a/bin/ak-todos b/modules/ak-todos index afe56f8..afe56f8 100755 --- a/bin/ak-todos +++ b/modules/ak-todos @@ -40,3 +40,14 @@ do ln -s $(pwd)/lib/$l $AK_LIBDIR/$l fi done + +# Find modules and create symlinks +modfiles=$(ls -1 $(pwd)/modules) +for m in $modfiles +do + if [ ! -L $AK_MODULESDIR/$m ] + then + echo "Non existing link: $(basename $m) creating..." + ln -s $(pwd)/modules/$m $AK_MODULESDIR/$m + fi +done |