.gitignore

@@ -3,6 +3,8 @@
 *.tar
 *.zip
 *.sh.kate-swp
+*.squashfs
+*.qcow2
 /distrobuilder
 /bin
 CT-Files/nginx/nginx_signing.rsa.pub

.vscode/tasks.json

@@ -14,6 +14,16 @@
                 "isDefault": true
             }
         },
+      /*  {
+            "label": "BuildVM",
+            "type": "shell",
+            "command": " export XZ_DEFAULTS='-T 0'; sudo ./distrobuilder build-incus CT-Build/${input:Distro}.yaml  -o image.variant=${input:BuildVariant} --vm;sudo chown $SUDO_USER:$SUDO_USER -R *.tar.xz disk.qcow2 ;rm -f incus.tar.xz; mv -f disk.qcow2 bin/${input:Distro}-${input:BuildVariant}.qcow2",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },*/
         {
             "label": "SetupImgBuilder",
             "type": "shell",

CT-Build/Alpine.yaml

@@ -275,7 +275,6 @@ files:
     To setup this container run the FirstRun script `/opt/Setup/Scripts/FirstRun.sh`
   variants:
   - nginx
-  - heimdall
 
 #PHP SetupScript
 - path: /opt/Setup/Scripts/PHPTool.sh
@@ -453,7 +452,7 @@ packages:
   #PKGS for Transfersh
   - packages:
     - curl
-    - git
+    - jq
     action: install
     variants:
     - transfersh

CT-Files/gitea/Scripts/Init.sh

@@ -17,7 +17,7 @@ mkdir -p /etc/gitea
 
 #Download Gitea binary
 echo "Downloading gitea binary..."
-curl --retry 7 --retry-delay 5 -L https://dl.gitea.io/gitea/"$giteaver"/gitea-"$giteaver"-linux-amd64 -O /usr/local/bin/gitea
+curl --retry 7 --retry-delay 5 -L https://dl.gitea.io/gitea/"$giteaver"/gitea-"$giteaver"-linux-amd64 -o /usr/local/bin/gitea || exit 1
 
 #Moving configs in place
 mv /opt/Setup/Configs/app.ini /etc/gitea/app.ini

CT-Files/nextcloud/Scripts/Init.sh

@@ -7,7 +7,7 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Setup PHP
-ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud || exit 1
+ash /opt/Setup/Scripts/PHPTool.sh -dv 83 nextcloud || exit 1
 rm /opt/Setup/Scripts/PHPTool.sh
 
 

CT-Files/transfersh/Scripts/Init.sh

@@ -4,11 +4,15 @@ addgroup transfersh
 adduser -S -s /bin/ash -h /home/transfersh -D -G transfersh transfersh
 mkdir -p /opt/transfer.sh/CustomTheme
 #Get Resources
-CurrentVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d : )
+CurrentVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | jq -r .tag_name)
+CurrentThemeVersion=$(curl -s https://git.bprieshof.nl/api/v1/repos/DarkTheme/brammp_transfer.sh-web/releases/latest |jq -r .tag_name)
 echo $CurrentVersion > /opt/transfer.sh/Version
+echo $CurrentThemeVersion > /opt/transfer.sh/ThemeVersion
 curl -L --retry 7 --retry-delay 5 https://github.com/dutchcoders/transfer.sh/releases/download/"$CurrentVersion"/transfersh-"$CurrentVersion"-linux-amd64 -o /opt/transfer.sh/transfersh-linux-amd64 || exit 1
+curl -L --retry 7 --retry-delay 5 https://git.bprieshof.nl/DarkTheme/brammp_transfer.sh-web/releases/download/"$CurrentThemeVersion"/brammp_transfer.sh-web-"$CurrentThemeVersion".tar.gz -o /tmp/brammp_transfer.sh-web.tar.gz || exit 1
 #Install transfer.sh custom theme
-git clone https://git.bprieshof.nl/DarkTheme/brammp_transfer.sh-web.git /opt/transfer.sh/CustomTheme
+tar -zxf /tmp/brammp_transfer.sh-web.tar.gz -C /opt/transfer.sh/CustomTheme
+rm  /tmp/brammp_transfer.sh-web.tar.gz
 #Configure transfer.sh
 mv /opt/Setup/Configs/transfersh.conf /opt/transfer.sh/transfersh.conf
 mv /opt/Setup/Configs/transfersh.service /etc/init.d/transfersh
@@ -18,3 +22,8 @@ chmod +x /opt/transfer.sh/transfersh-linux-amd64
 chown -R transfersh:transfersh /opt/transfer.sh
 #Enable service
 rc-update add transfersh
+
+
+
+
+

CT-Files/transfersh/Scripts/update.sh

@@ -1,5 +1,6 @@
 #!/bin/ash
-CurtransfershVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d : )
+CurtransfershVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | jq -r .tag_name)
+CurtransfershThemeVersion=$(curl -s https://git.bprieshof.nl/api/v1/repos/DarkTheme/brammp_transfer.sh-web/releases/latest |jq -r .tag_name)
 
 if test "$CurtransfershVersion" = "$(cat /opt/transfer.sh/Version)" ; then
     echo 'Transfer.sh up-to-date'
@@ -7,6 +8,7 @@ if test "$CurtransfershVersion" = "$(cat /opt/transfer.sh/Version)" ; then
 else
     echo 'Updating Transfer.sh'
     service transfersh stop
+    if [ -f "/opt/transfer.sh/transfersh-linux-amd64.old" ]; then rm /opt/transfer.sh/transfersh-linux-amd64.old ;fi
     mv /opt/transfer.sh/transfersh-linux-amd64 /opt/transfer.sh/transfersh-linux-amd64.old
     curl -L -o /opt/transfer.sh/transfersh-linux-amd64  https://github.com/dutchcoders/transfer.sh/releases/download/"$CurtransfershVersion"/transfersh-"$CurtransfershVersion"-linux-amd64
     chmod +x /opt/transfer.sh/transfersh-linux-amd64
@@ -14,3 +16,21 @@ else
     echo "$CurtransfershVersion" > /opt/transfer.sh/Version
     service transfersh start
 fi
+
+if test "$CurtransfershThemeVersion" = "$(cat /opt/transfer.sh/ThemeVersion)" ; then
+    echo 'Custom theme for Transfer.sh up-to-date'
+    exit
+else
+    echo 'Updating Custom theme for Transfer.sh'
+    service transfersh stop
+    if [ -d "/opt/transfer.sh/CustomTheme.old" ]; then rm -rf /opt/transfer.sh/CustomTheme.old ;fi
+    mv /opt/transfer.sh/CustomTheme /opt/transfer.sh/CustomTheme.old
+    curl -L --retry 7 --retry-delay 5 https://git.bprieshof.nl/DarkTheme/brammp_transfer.sh-web/releases/download/"$CurtransfershThemeVersion"/brammp_transfer.sh-web-"$CurtransfershThemeVersion".tar.gz -o /tmp/brammp_transfer.sh-web.tar.gz || exit 1
+    tar -zxf /tmp/brammp_transfer.sh-web.tar.gz -C /opt/transfer.sh/CustomTheme
+    chown -R transfersh:transfersh  /opt/transfer.sh/CustomTheme
+    rm  /tmp/brammp_transfer.sh-web.tar.gz
+    echo "$CurtransfershThemeVersion" > /opt/transfer.sh/ThemeVersion
+    service transfersh start
+fi
+
+

Scripts/AlpinePHPTool.sh

@@ -34,10 +34,11 @@ show_help () {
 Usage: $self [-dfpuh] <Config name>
 
 Options:
-    -d,  Distrobuilder: Install everything and use Local configs (non interactive)
+    -d,           Distrobuilder:  Install everything and use Local configs (non interactive)
-    -f,  Fresh:         Install everything and fetch config
+    -f,           Fresh:          Install everything and fetch config
-    -p,  Purge:         Remove all PHP packlages and back configuration (handy for distro release upgrades)
+    -p,           Purge:          Remove all PHP packlages and back configuration (handy for distro release upgrades)
-    -u,  Upgrade:       Run both Purge and Install steps
+    -u,           Upgrade:        Run both Purge and Install steps
+    -v <PhpVer>,  Set PHPVersion: specify the PHP version version (example 84 for 8.4)
 
 Cnfigurations:
     $Configurations
@@ -55,13 +56,14 @@ echo_exit (){
     exit 1
 }
 
-#Arugment/optin handeling
+#Arugment/option handeling
-while getopts 'dfpuh' opt; do
+while getopts 'dfpuhv:' opt; do
     case $opt in
         d) set_mode distrobuilder;;
         f) set_mode fresh ;;
         p) set_mode purge ;;
         u) set_mode upgrade ;;
+        v) NewPHPVer="${OPTARG}" ;;
         h) show_help
            exit ;;
         *) show_help
@@ -167,7 +169,7 @@ case $mode in
     ;;
     upgrade)
         #Set config location
-        configStore=/opt/Setup/Configs
+        configStore=/tmp
         fetch_Config
         service nginx stop
         run_Purge