From 8a83b7243a098a4c06b71f6727252d9d6cdecd49 Mon Sep 17 00:00:00 2001
From: kaotisk <kaotisk@arching-kaos.org>
Date: Sun, 15 Dec 2024 21:38:00 +0200
Subject: Modules fixes

---
 modules/follow/main.sh   | 5 +++--
 modules/mixtapes/main.sh | 5 +++--
 modules/news/main.sh     | 5 +++--
 modules/smfiles/main.sh  | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/follow/main.sh b/modules/follow/main.sh
index 55fc2c6..ef36bb2 100755
--- a/modules/follow/main.sh
+++ b/modules/follow/main.sh
@@ -28,12 +28,13 @@
 ##    -u, --unfollow              Unfollows a ...
 ##
 fullprogrampath="$(realpath $0)"
-PROGRAM="ak-module-$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+MODULE="$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+PROGRAM="ak-module-$MODULE"
 descriptionString="Following stuff"
 
 source $AK_LIBDIR/_ak_log
 source $AK_LIBDIR/_ak_script
-source $AK_MODULESDIR/$PROGRAM/lib.sh
+source $AK_MODULESDIR/$MODULE/lib.sh
 
 if [ ! -z $1 ]
 then
diff --git a/modules/mixtapes/main.sh b/modules/mixtapes/main.sh
index a9373f6..ce9b35a 100755
--- a/modules/mixtapes/main.sh
+++ b/modules/mixtapes/main.sh
@@ -28,10 +28,11 @@
 ##
 # We can extend it by calling the _ak_zblock_pack.sh mixtape/add data ## ORIGINAL LINE
 fullprogrampath="$(realpath $0)"
-PROGRAM="ak-module-$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+MODULE="$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+PROGRAM="ak-module-$MODULE"
 descriptionString="AK mixtape block creator"
 source $AK_LIBDIR/_ak_script
-source $AK_MODULESDIR/$PROGRAM/lib.sh
+source $AK_MODULESDIR/$MODULE/lib.sh
 
 if [ ! -z $1 ]; then
     case $1 in
diff --git a/modules/news/main.sh b/modules/news/main.sh
index 9fa49de..672bd48 100755
--- a/modules/news/main.sh
+++ b/modules/news/main.sh
@@ -34,11 +34,12 @@
 ##                                NEWS zblock
 ##
 fullprogrampath="$(realpath $0)"
-PROGRAM="ak-module-$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+MODULE="$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+PROGRAM="ak-module-$MODULE"
 descriptionString="Module to read, create and add zblocks"
 
 source $AK_LIBDIR/_ak_script
-source $AK_MODULESDIR/$PROGRAM/lib.sh
+source $AK_MODULESDIR/$MODULE/lib.sh
 
 if [ ! -z $1 ]
 then
diff --git a/modules/smfiles/main.sh b/modules/smfiles/main.sh
index 55284e1..7ba20f7 100755
--- a/modules/smfiles/main.sh
+++ b/modules/smfiles/main.sh
@@ -30,12 +30,13 @@ pwd > .pwd
 CRD=$(cat .pwd)
 
 fullprogrampath="$(realpath $0)"
-PROGRAM="ak-module-$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+MODULE="$(realpath $0 | rev |cut -d '/' -f 2 | rev)"
+PROGRAM="ak-module-$MODULE"
 descriptionString="Module to files in zchain"
 
 source $AK_LIBDIR/_ak_log
 source $AK_LIBDIR/_ak_script
-source $AK_MODULESDIR/$PROGRAM/lib.sh
+source $AK_MODULESDIR/$MODULE/lib.sh
 
 if [ ! -d $ZFILESDIR ]
 then
-- 
cgit v1.2.3