From a4815095b73780eda3102fcafefda29dd4ec340b Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 25 Sep 2020 10:37:00 +0200
Subject: [PATCH] Migration form apt.list to generic.pkg.list

---
 AppendCMS.sh                                  | 18 +++----
 AppendModule.sh                               | 30 ++++++------
 CMS/nextcloud/{apt.list => generic.pkg.list}  |  0
 .../apache/{apt.list => generic.pkg.list}     |  0
 .../generic/{apt.list => generic.pkg.list}    |  0
 .../nginx/{apt.list => generic.pkg.list}      |  0
 .../{apt.list => generic.pkg.list}            |  0
 Scripts/SMI.sh                                | 12 ++---
 .../php-fpm/{apt.list => generic.pkg.list}    |  0
 .../redis/{apt.list => generic.pkg.list}      |  0
 installer.sh                                  | 48 +++++++++----------
 11 files changed, 54 insertions(+), 54 deletions(-)
 rename CMS/nextcloud/{apt.list => generic.pkg.list} (100%)
 rename CoreModules/apache/{apt.list => generic.pkg.list} (100%)
 rename CoreModules/generic/{apt.list => generic.pkg.list} (100%)
 rename CoreModules/nginx/{apt.list => generic.pkg.list} (100%)
 rename CoreModules/nginx_nonphp/{apt.list => generic.pkg.list} (100%)
 rename SubModules/php-fpm/{apt.list => generic.pkg.list} (100%)
 rename SubModules/redis/{apt.list => generic.pkg.list} (100%)

diff --git a/AppendCMS.sh b/AppendCMS.sh
index a7df2fd..39e0e6a 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -7,7 +7,7 @@ if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then
 
 source /etc/ICTM/selopts.list
 source /etc/ICTM/mainvar.list
-rm /tmp/apt.list
+rm /tmp/pkg.list
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
@@ -153,14 +153,14 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
 #   AptList   #
 ##-----------##
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list
-    printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list; then
+    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
 fi
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-apt.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-apt.list >>/tmp/apt.list
-    printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list; then
+    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
 fi
 
 
@@ -188,8 +188,8 @@ fi
 ##-------------##
 
 $PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##
diff --git a/AppendModule.sh b/AppendModule.sh
index 7dc6d78..517519f 100644
--- a/AppendModule.sh
+++ b/AppendModule.sh
@@ -11,7 +11,7 @@ if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then
 
 source /etc/ICTM/selopts.list
 source /etc/ICTM/mainvar.list
-rm /tmp/apt.list
+rm /tmp/pkg.list
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
@@ -156,23 +156,23 @@ for val1 in ${option[*]}; do
     if test -z "$modListed"
     then
         #Fetching from local repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     else
         #Fetching from remote repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$modListed"apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$modListed"generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-apt.list; then
-           curl "$modListed""$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-generic.pkg.list; then
+           curl "$modListed""$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     fi
 done
@@ -213,8 +213,8 @@ done
 ##-------------##
 
 $PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##
diff --git a/CMS/nextcloud/apt.list b/CMS/nextcloud/generic.pkg.list
similarity index 100%
rename from CMS/nextcloud/apt.list
rename to CMS/nextcloud/generic.pkg.list
diff --git a/CoreModules/apache/apt.list b/CoreModules/apache/generic.pkg.list
similarity index 100%
rename from CoreModules/apache/apt.list
rename to CoreModules/apache/generic.pkg.list
diff --git a/CoreModules/generic/apt.list b/CoreModules/generic/generic.pkg.list
similarity index 100%
rename from CoreModules/generic/apt.list
rename to CoreModules/generic/generic.pkg.list
diff --git a/CoreModules/nginx/apt.list b/CoreModules/nginx/generic.pkg.list
similarity index 100%
rename from CoreModules/nginx/apt.list
rename to CoreModules/nginx/generic.pkg.list
diff --git a/CoreModules/nginx_nonphp/apt.list b/CoreModules/nginx_nonphp/generic.pkg.list
similarity index 100%
rename from CoreModules/nginx_nonphp/apt.list
rename to CoreModules/nginx_nonphp/generic.pkg.list
diff --git a/Scripts/SMI.sh b/Scripts/SMI.sh
index ac49623..3245bf8 100644
--- a/Scripts/SMI.sh
+++ b/Scripts/SMI.sh
@@ -70,12 +70,12 @@ $PKGI curl > $OUTPUT 2>&1
 #    Generating APT list    #
 ##-------------------------##
 #General aptList
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-apt.list; then
- curl "$mtype"/"$webserv"-apt.list >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-generic.pkg.list; then
+ curl "$mtype"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
 fi
 #Webserver specific aptList
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/apt.list; then
- curl "$mtype"/apt.list >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/generic.pkg.list; then
+ curl "$mtype"/generic.pkg.list >>/tmp/pkg.list
 fi
 
 
@@ -107,8 +107,8 @@ fi
 ##-------------##
 
 $PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##
diff --git a/SubModules/php-fpm/apt.list b/SubModules/php-fpm/generic.pkg.list
similarity index 100%
rename from SubModules/php-fpm/apt.list
rename to SubModules/php-fpm/generic.pkg.list
diff --git a/SubModules/redis/apt.list b/SubModules/redis/generic.pkg.list
similarity index 100%
rename from SubModules/redis/apt.list
rename to SubModules/redis/generic.pkg.list
diff --git a/installer.sh b/installer.sh
index aaa2ff9..7cdc3be 100644
--- a/installer.sh
+++ b/installer.sh
@@ -335,11 +335,11 @@ declare -n CMSL="$webserv"CMSL
 declare -n options="$webserv"Options
 
 #Generating APT-List for webserver
-curl --silent --show-error "$repo"/raw/"$branchtype"/"$branch"/CoreModules/generic/apt.list >>/tmp/apt.list
-printf " " >>/tmp/apt.list
+curl --silent --show-error "$repo"/raw/"$branchtype"/"$branch"/CoreModules/generic/generic.pkg.list >>/tmp/pkg.list
+printf " " >>/tmp/pkg.list
 
-curl --silent --show-error "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/apt.list >>/tmp/apt.list
-printf " " >>/tmp/apt.list
+curl --silent --show-error "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/generic.pkg.list >>/tmp/pkg.list
+printf " " >>/tmp/pkg.list
 
 
 ##-----------------##
@@ -424,23 +424,23 @@ for val1 in ${option[*]}; do
     if test -z "$modListed"
     then
         #Fetching from local repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     else
         #Fetching from remote repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$modListed"apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$modListed"generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-apt.list; then
-           curl "$modListed""$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-generic.pkg.list; then
+           curl "$modListed""$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     fi
 done
@@ -471,13 +471,13 @@ fi
 CMS="${CMS//:}" && CMS="${CMS,,}"
 
 #Generating APT-List CMS
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list; then
-   curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list
-   printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list; then
+   curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
+   printf " " >>/tmp/pkg.list
 fi
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-apt.list; then
- curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-apt.list >>/tmp/apt.list
- printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list; then
+ curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+ printf " " >>/tmp/pkg.list
 
 fi
 
@@ -535,8 +535,8 @@ fi
 ##-------------##
 
 $PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##