Migration form apt.list to generic.pkg.list

2020-09-25 10:37:00 +02:00
parent 1599216685
commit a4815095b7
11 changed files with 54 additions and 54 deletions
--- 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


 ##---------------##
--- 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


 ##---------------##
--- a/CMS/nextcloud/generic.pkg.list
+++ b/CMS/nextcloud/generic.pkg.list
--- a/CoreModules/apache/generic.pkg.list
+++ b/CoreModules/apache/generic.pkg.list
--- a/CoreModules/generic/generic.pkg.list
+++ b/CoreModules/generic/generic.pkg.list
--- a/CoreModules/nginx/generic.pkg.list
+++ b/CoreModules/nginx/generic.pkg.list
--- a/CoreModules/nginx_nonphp/generic.pkg.list
+++ b/CoreModules/nginx_nonphp/generic.pkg.list
--- 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


 ##---------------##
--- a/SubModules/php-fpm/generic.pkg.list
+++ b/SubModules/php-fpm/generic.pkg.list
--- a/SubModules/redis/generic.pkg.list
+++ b/SubModules/redis/generic.pkg.list
--- 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


 ##---------------##