formatting

CHANGELOG.md

@@ -16,27 +16,16 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🐞 Bug Fixes
 
-    - FreshRSS: fix needed php modules [@MickLesk](https://github.com/MickLesk) ([#5886](https://github.com/community-scripts/ProxmoxVE/pull/5886))
-    - core: Fix VAAPI passthrough for unprivileged LXC containers via devX  [@MickLesk](https://github.com/MickLesk) ([#5875](https://github.com/community-scripts/ProxmoxVE/pull/5875))
-    - tools.func: fix an bug while php libapache2-mod breaks [@MickLesk](https://github.com/MickLesk) ([#5857](https://github.com/community-scripts/ProxmoxVE/pull/5857))
     - BabyBuddy: fix path issues for update [@MickLesk](https://github.com/MickLesk) ([#5856](https://github.com/community-scripts/ProxmoxVE/pull/5856))
+    - tools.func: fix an bug while php libapache2-mod breaks [@MickLesk](https://github.com/MickLesk) ([#5857](https://github.com/community-scripts/ProxmoxVE/pull/5857))
 
   - #### ✨ New Features
 
+    - Refactor: Commafeed [@tremor021](https://github.com/tremor021) ([#5802](https://github.com/community-scripts/ProxmoxVE/pull/5802))
     - tools.func: strip leading folders for prebuild assets [@MickLesk](https://github.com/MickLesk) ([#5865](https://github.com/community-scripts/ProxmoxVE/pull/5865))
 
-  - #### 💥 Breaking Changes
-
-    - Refactor: Stirling-PDF [@MickLesk](https://github.com/MickLesk) ([#5872](https://github.com/community-scripts/ProxmoxVE/pull/5872))
-
   - #### 🔧 Refactor
 
-    - Refactor: Firefly [@tremor021](https://github.com/tremor021) ([#5844](https://github.com/community-scripts/ProxmoxVE/pull/5844))
-    - Refactor: Ghost (use now MySQL)  [@MickLesk](https://github.com/MickLesk) ([#5871](https://github.com/community-scripts/ProxmoxVE/pull/5871))
-    - Refactor: Glance [@tremor021](https://github.com/tremor021) ([#5874](https://github.com/community-scripts/ProxmoxVE/pull/5874))
-    - Refactor: Commafeed [@tremor021](https://github.com/tremor021) ([#5802](https://github.com/community-scripts/ProxmoxVE/pull/5802))
-    - Refactor: FlareSolverr [@tremor021](https://github.com/tremor021) ([#5845](https://github.com/community-scripts/ProxmoxVE/pull/5845))
-    - Refactor: Gitea [@tremor021](https://github.com/tremor021) ([#5876](https://github.com/community-scripts/ProxmoxVE/pull/5876))
     - Refactor: FreshRSS [@tremor021](https://github.com/tremor021) ([#5847](https://github.com/community-scripts/ProxmoxVE/pull/5847))
     - Refactor: Fluid-Calendar [@tremor021](https://github.com/tremor021) ([#5846](https://github.com/community-scripts/ProxmoxVE/pull/5846))
     - Refactor: EMQX [@tremor021](https://github.com/tremor021) ([#5840](https://github.com/community-scripts/ProxmoxVE/pull/5840))

ct/docker.sh

@@ -20,68 +20,18 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  get_latest_release() {
-    curl -fsSL https://api.github.com/repos/"$1"/releases/latest | grep '"tag_name":' | cut -d'"' -f4
-  }
-
-  msg_info "Updating base system"
-  $STD apt-get update
-  $STD apt-get -y upgrade
-  msg_ok "Base system updated"
-
-  msg_info "Updating Docker Engine"
-  $STD apt-get install --only-upgrade -y docker-ce docker-ce-cli containerd.io
-  msg_ok "Docker Engine updated"
-
-  if [[ -f /usr/local/lib/docker/cli-plugins/docker-compose ]]; then
-    COMPOSE_BIN="/usr/local/lib/docker/cli-plugins/docker-compose"
-    COMPOSE_NEW_VERSION=$(get_latest_release "docker/compose")
-    msg_info "Updating Docker Compose to $COMPOSE_NEW_VERSION"
-    curl -fsSL "https://github.com/docker/compose/releases/download/${COMPOSE_NEW_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
-      -o "$COMPOSE_BIN"
-    chmod +x "$COMPOSE_BIN"
-    msg_ok "Docker Compose updated"
-  fi
-
-  if docker ps -a --format '{{.Names}}' | grep -q '^portainer$'; then
-    msg_info "Updating Portainer"
-    docker pull portainer/portainer-ce:latest
-    docker stop portainer && docker rm portainer
-    docker volume create portainer_data >/dev/null 2>&1
-    $STD docker run -d \
-      -p 8000:8000 \
-      -p 9443:9443 \
-      --name=portainer \
-      --restart=always \
-      -v /var/run/docker.sock:/var/run/docker.sock \
-      -v portainer_data:/data \
-      portainer/portainer-ce:latest
-    msg_ok "Updated Portainer"
-  fi
-
-  if docker ps -a --format '{{.Names}}' | grep -q '^portainer_agent$'; then
-    msg_info "Updating Portainer Agent"
-    docker pull portainer/agent:latest
-    docker stop portainer_agent && docker rm portainer_agent
-    $STD docker run -d \
-      -p 9001:9001 \
-      --name=portainer_agent \
-      --restart=always \
-      -v /var/run/docker.sock:/var/run/docker.sock \
-      -v /var/lib/docker/volumes:/var/lib/docker/volumes \
-      portainer/agent
-    msg_ok "Updated Portainer Agent"
-  fi
-
-  msg_info "Cleaning up"
-  $STD apt-get -y autoremove
-  $STD apt-get -y autoclean
-  msg_ok "Cleanup complete"
-  exit
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /var ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Updating ${APP} LXC"
+    $STD apt-get update
+    $STD apt-get -y upgrade
+    msg_ok "Updated ${APP} LXC"
+    exit
 }
 
 start
@@ -89,4 +39,4 @@ build_container
 description
 
 msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"

ct/firefly.sh

@@ -29,20 +29,17 @@ function update_script() {
     exit
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/firefly-iii/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
-  if [[ "${RELEASE}" != "$(cat ~/.firefly 2>/dev/null)" ]] || [[ ! -f ~/.firefly ]]; then
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Stopping Apache2"
     systemctl stop apache2
     msg_ok "Stopped Apache2"
 
-    msg_info "Backing up data"
+    msg_info "Updating ${APP} to v${RELEASE}"
     cp /opt/firefly/.env /opt/.env
     cp -r /opt/firefly/storage /opt/storage
-    msg_ok "Backed up data"
-
-    fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii"
-
-    msg_info "Updating ${APP} to v${RELEASE}"
-    rm -rf /opt/firefly/storage
+    cd /opt
+    curl -fsSL "https://github.com/firefly-iii/firefly-iii/releases/download/v${RELEASE}/FireflyIII-v${RELEASE}.tar.gz" -o $(basename "https://github.com/firefly-iii/firefly-iii/releases/download/v${RELEASE}/FireflyIII-v${RELEASE}.tar.gz")
+    tar -xzf FireflyIII-v${RELEASE}.tar.gz -C /opt/firefly --exclude='storage'
     cp /opt/.env /opt/firefly/.env
     cp -r /opt/storage /opt/firefly/storage
     cd /opt/firefly
@@ -53,12 +50,16 @@ function update_script() {
     $STD php artisan view:clear
     $STD php artisan firefly-iii:upgrade-database
     $STD php artisan firefly-iii:laravel-passport-keys
+    echo "${RELEASE}" >"/opt/${APP}_version.txt"
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Apache2"
     systemctl start apache2
     msg_ok "Started Apache2"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/FireflyIII-v${RELEASE}.tar.gz
+    msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."

ct/flaresolverr.sh

@@ -23,23 +23,20 @@ function update_script() {
   header_info
   check_container_storage
   check_container_resources
-
   if [[ ! -f /etc/systemd/system/flaresolverr.service ]]; then
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  RELEASE=$(curl -fsSL https://api.github.com/repos/FlareSolverr/FlareSolverr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
-  if [[ "${RELEASE}" != "$(cat ~/.flaresolverr 2>/dev/null)" ]] || [[ ! -f ~/.flaresolverr ]]; then
-    msg_info "Stopping service"
+  RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
+  if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
+    msg_info "Updating $APP LXC"
     systemctl stop flaresolverr
-    msg_ok "Stopped service"
-
-    rm -rf /opt/flaresolverr
-    fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
-
-    msg_info "Starting service"
+    curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o $(basename "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz")
+    tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
+    rm flaresolverr_linux_x64.tar.gz
     systemctl start flaresolverr
-    msg_ok "Started service"
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+    msg_ok "Updated $APP LXC"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"
   fi

ct/ghost.sh

@@ -20,31 +20,26 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
+    header_info
+    check_container_storage
+    check_container_resources
+    msg_info "Updating ${APP} LXC"
 
-  if ! dpkg-query -W -f='${Status}' mariadb-server 2>/dev/null | grep -q "install ok installed"; then
-    setup_mysql
-  fi
-  NODE_VERSION="22" setup_nodejs
-
-  msg_info "Updating ${APP} LXC"
-  if command -v ghost &>/dev/null; then
-    current_version=$(ghost version | grep 'Ghost-CLI version' | awk '{print $3}')
-    latest_version=$(npm show ghost-cli version)
-    if [ "$current_version" != "$latest_version" ]; then
-      msg_info "Updating ${APP} from version v${current_version} to v${latest_version}"
-      $STD npm install -g ghost-cli@latest
-      msg_ok "Updated Successfully"
+    if command -v ghost &>/dev/null; then
+        current_version=$(ghost version | grep 'Ghost-CLI version' | awk '{print $3}')
+        latest_version=$(npm show ghost-cli version)
+        if [ "$current_version" != "$latest_version" ]; then
+            msg_info "Updating ${APP} from version v${current_version} to v${latest_version}"
+            $STD npm install -g ghost-cli@latest
+            msg_ok "Updated Successfully"
+        else
+            msg_ok "${APP} is already at v${current_version}"
+        fi
     else
-      msg_ok "${APP} is already at v${current_version}"
+        msg_error "No ${APP} Installation Found!"
+        exit
     fi
-  else
-    msg_error "No ${APP} Installation Found!"
     exit
-  fi
-  exit
 }
 
 start
@@ -54,4 +49,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:2368${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:2368${CL}"

ct/gitea.sh

@@ -20,33 +20,24 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -f /usr/local/bin/gitea ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-  RELEASE=$(curl -fsSL https://github.com/go-gitea/gitea/releases/latest | grep "title>Release" | cut -d " " -f 4 | sed 's/^v//')
-  if [[ "${RELEASE}" != "$(cat ~/.gitea 2>/dev/null)" ]] || [[ ! -f ~/.gitea ]]; then
-    msg_info "Stopping service"
-    systemctl stop gitea
-    msg_ok "Service stopped"
-
-    rm -rf /usr/local/bin/gitea
-    fetch_and_deploy_gh_release "gitea" "go-gitea/gitea" "singlefile" "latest" "/usr/local/bin" "gitea-*-linux-amd64"
-    chmod +x /usr/local/bin/gitea
-
-    msg_info "Starting service"
-    systemctl start gitea
-    msg_ok "Started service"
-
-    msg_ok "Update Successful"
-  else
-    msg_ok "No update required. ${APP} is already at ${RELEASE}"
-  fi
-  exit
+   header_info
+   check_container_storage
+   check_container_resources
+   if [[ ! -f /usr/local/bin/gitea ]]; then
+      msg_error "No ${APP} Installation Found!"
+      exit
+   fi
+   RELEASE=$(curl -fsSL https://github.com/go-gitea/gitea/releases/latest | grep "title>Release" | cut -d " " -f 4 | sed 's/^v//')
+   msg_info "Updating $APP to ${RELEASE}"
+   FILENAME="gitea-$RELEASE-linux-amd64"
+   curl -fsSL "https://github.com/go-gitea/gitea/releases/download/v$RELEASE/gitea-$RELEASE-linux-amd64" -o $FILENAME
+   systemctl stop gitea
+   rm -rf /usr/local/bin/gitea
+   mv $FILENAME /usr/local/bin/gitea
+   chmod +x /usr/local/bin/gitea
+   systemctl start gitea
+   msg_ok "Updated $APP Successfully"
+   exit
 }
 
 start

ct/glance.sh

@@ -28,19 +28,28 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
+
   RELEASE=$(curl -fsSL https://api.github.com/repos/glanceapp/glance/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat ~/.glance 2>/dev/null)" ]] || [[ ! -f ~/.glance ]]; then
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Stopping Service"
     systemctl stop glance
     msg_ok "Stopped Service"
 
-    rm -f /opt/glance/glance
-    fetch_and_deploy_gh_release "glance" "glanceapp/glance" "prebuild" "latest" "/opt/glance" "glance-linux-amd64.tar.gz"
+    msg_info "Updating ${APP} to v${RELEASE}"
+    cd /opt
+    curl -fsSL "https://github.com/glanceapp/glance/releases/download/v${RELEASE}/glance-linux-amd64.tar.gz" -o $(basename "https://github.com/glanceapp/glance/releases/download/v${RELEASE}/glance-linux-amd64.tar.gz")
+    rm -rf /opt/glance/glance
+    tar -xzf glance-linux-amd64.tar.gz -C /opt/glance
+    echo "${RELEASE}" >"/opt/${APP}_version.txt"
+    msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start glance
     msg_ok "Started Service"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/glance-linux-amd64.tar.gz
+    msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."

ct/stirling-pdf.sh

@@ -27,41 +27,31 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  RELEASE=$(curl -fsSL https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  if [[ "${RELEASE}" != "$(cat ~/.stirling-pdf 2>/dev/null)" ]] || [[ ! -f ~/.stirling-pdf ]]; then
-    if [[ ! -f /etc/systemd/system/unoserver.service ]]; then
-      msg_custom "⚠️ " "\e[33m" "Legacy installation detected – please recreate the container using the latest install script."
-      exit 0
-    fi
-
-    PYTHON_VERSION="3.12" setup_uv
-    JAVA_VERSION="21" setup_java
-
-    msg_info "Stopping Services"
-    systemctl stop stirlingpdf libreoffice-listener unoserver
-    msg_ok "Stopped Services"
-
-    if [[ -f ~/.Stirling-PDF-login ]]; then
-      USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "stirling-pdf" "Stirling-Tools/Stirling-PDF" "singlefile" "latest" "/opt/Stirling-PDF" "Stirling-PDF-with-login.jar"
-      mv /opt/Stirling-PDF/Stirling-PDF-with-login.jar /opt/Stirling-PDF/Stirling-PDF.jar
-    else
-      USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "stirling-pdf" "Stirling-Tools/Stirling-PDF" "singlefile" "latest" "/opt/Stirling-PDF" "Stirling-PDF.jar"
-    fi
-
-    msg_info "Refreshing Font Cache"
-    $STD fc-cache -fv
-    msg_ok "Font Cache Updated"
-
-    msg_info "Starting Services"
-    systemctl start stirlingpdf libreoffice-listener unoserver
-    msg_ok "Started Services"
-
-    msg_ok "Update Successful"
-  else
-    msg_ok "No update required. ${APP} is already at v${RELEASE}"
+  msg_info "Updating ${APP}"
+  systemctl stop stirlingpdf
+  if [[ -n $(dpkg -l | grep -w ocrmypdf) ]] && [[ -z $(dpkg -l | grep -w qpdf) ]]; then
+    $STD apt-get remove -y ocrmypdf
+    $STD apt-get install -y qpdf
   fi
+  RELEASE=$(curl -fsSL https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  curl -fsSL "https://github.com/Stirling-Tools/Stirling-PDF/archive/refs/tags/v$RELEASE.tar.gz" -o $(basename "https://github.com/Stirling-Tools/Stirling-PDF/archive/refs/tags/v$RELEASE.tar.gz")
+  tar -xzf v$RELEASE.tar.gz
+  cd Stirling-PDF-$RELEASE
+  chmod +x ./gradlew
+  $STD ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+  rm -rf /opt/Stirling-PDF/Stirling-PDF-*.jar
+  cp -r ./stirling-pdf/build/libs/*.jar /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar
+  cp -r scripts /opt/Stirling-PDF/
+  cp -r pipeline /opt/Stirling-PDF/
+  cp -r stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+  cd ~
+  rm -rf Stirling-PDF-$RELEASE v$RELEASE.tar.gz
+  ln -sf /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar /opt/Stirling-PDF/Stirling-PDF.jar
+  systemctl start stirlingpdf
+  msg_ok "Updated ${APP} to v$RELEASE"
   exit
 }
+
 start
 build_container
 description

frontend/public/json/stirling-pdf.json

@@ -1,35 +1,35 @@
 {
-  "name": "Stirling-PDF",
-  "slug": "stirling-pdf",
-  "categories": [
-    12
-  ],
-  "date_created": "2024-05-02",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 8080,
-  "documentation": null,
-  "website": "https://github.com/Stirling-Tools/Stirling-PDF",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/stirling-pdf.webp",
-  "config_path": "/opt/Stirling-PDF/.env",
-  "description": "Stirling-PDF is a powerful locally hosted web based PDF manipulation tool that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/stirling-pdf.sh",
-      "resources": {
-        "cpu": 2,
-        "ram": 2048,
-        "hdd": 8,
-        "os": "debian",
-        "version": "12"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": "admin",
-    "password": "stirling"
-  },
-  "notes": []
+    "name": "Stirling-PDF",
+    "slug": "stirling-pdf",
+    "categories": [
+        12
+    ],
+    "date_created": "2024-05-02",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 8080,
+    "documentation": null,
+    "website": "https://github.com/Stirling-Tools/Stirling-PDF",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/stirling-pdf.webp",
+    "config_path": "/opt/Stirling-PDF/.env",
+    "description": "Stirling-PDF is a powerful locally hosted web based PDF manipulation tool that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/stirling-pdf.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 2048,
+                "hdd": 8,
+                "os": "debian",
+                "version": "12"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": []
 }

install/docker-install.sh

@@ -29,17 +29,7 @@ echo -e '{\n  "log-driver": "journald"\n}' >/etc/docker/daemon.json
 $STD sh <(curl -fsSL https://get.docker.com)
 msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
 
-read -r -p "${TAB3}Install Docker Compose v2 plugin? <y/N> " prompt_compose
-if [[ ${prompt_compose,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-  mkdir -p /usr/local/lib/docker/cli-plugins
-  curl -fsSL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_LATEST_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
-    -o /usr/local/lib/docker/cli-plugins/docker-compose
-  chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-  msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-fi
-
-read -r -p "${TAB3}Would you like to add Portainer (UI)? <y/N> " prompt
+read -r -p "${TAB3}Would you like to add Portainer? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
   msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"
   docker volume create portainer_data >/dev/null
@@ -53,9 +43,9 @@ if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
     portainer/portainer-ce:latest
   msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION"
 else
-  read -r -p "${TAB3}Would you like to install the Portainer Agent (for remote management)? <y/N> " prompt_agent
-  if [[ ${prompt_agent,,} =~ ^(y|yes)$ ]]; then
-    msg_info "Installing Portainer Agent $PORTAINER_AGENT_LATEST_VERSION"
+  read -r -p "${TAB3}Would you like to add the Portainer Agent? <y/N> " prompt
+  if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
+    msg_info "Installing Portainer agent $PORTAINER_AGENT_LATEST_VERSION"
     $STD docker run -d \
       -p 9001:9001 \
       --name portainer_agent \
@@ -67,42 +57,13 @@ else
   fi
 fi
 
-read -r -p "${TAB3}Expose Docker TCP socket (insecure) ? [n = No, l = Local only (127.0.0.1), a = All interfaces (0.0.0.0)] <n/l/a>: " socket_choice
-case "${socket_choice,,}" in
-  l)
-    socket="tcp://127.0.0.1:2375"
-    ;;
-  a)
-    socket="tcp://0.0.0.0:2375"
-    ;;
-  *)
-    socket=""
-    ;;
-esac
-
-if [[ -n "$socket" ]]; then
-  msg_info "Enabling Docker TCP socket on $socket"
-  $STD apt-get install -y jq
-
-  tmpfile=$(mktemp)
-  jq --arg sock "$socket" '. + { "hosts": ["unix:///var/run/docker.sock", $sock] }' /etc/docker/daemon.json > "$tmpfile" && mv "$tmpfile" /etc/docker/daemon.json
-
-  mkdir -p /etc/systemd/system/docker.service.d
-  cat <<EOF > /etc/systemd/system/docker.service.d/override.conf
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd
-EOF
-
-  $STD systemctl daemon-reexec
-  $STD systemctl daemon-reload
-
-  if systemctl restart docker; then
-    msg_ok "Docker TCP socket available on $socket"
-  else
-    msg_error "Docker failed to restart. Check journalctl -xeu docker.service"
-    exit 1
-  fi
+read -r -p "${TAB3}Would you like to expose the Docker TCP socket? <y/N> " prompt
+if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
+  msg_info "Exposing Docker TCP socket"
+  $STD mkdir -p /etc/docker
+  $STD echo '{ "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"] }' > /etc/docker/daemon.json
+  $STD rc-service docker restart
+  msg_ok "Exposed Docker TCP socket at tcp://+:2375"
 fi
 
 motd_ssh

install/firefly-install.sh

@@ -14,14 +14,17 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y apache2
+curl -fsSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg
+echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ bookworm main" >/etc/apt/sources.list.d/php.list
+$STD apt-get update
+$STD apt-get install -y \
+  apache2 \
+  libapache2-mod-php8.4 \
+  php8.4-{bcmath,cli,intl,curl,zip,gd,xml,mbstring,mysql} \
+  composer
 msg_ok "Installed Dependencies"
 
-PHP_VERSION="8.4" PHP_APACHE="YES" PHP_MODULE="mysql" setup_php
-setup_composer
 setup_mariadb
-fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii"
-LOCAL_IP=$(hostname -I | awk '{print $1}')
 
 msg_info "Setting up database"
 DB_NAME=firefly
@@ -38,7 +41,13 @@ mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRI
 } >>~/firefly.creds
 msg_ok "Set up database"
 
-msg_info "Configuring Firefly III (Patience)"
+msg_info "Installing Firefly III (Patience)"
+LOCAL_IP=$(hostname -I | awk '{print $1}')
+RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/firefly-iii/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+cd /opt
+curl -fsSL "https://github.com/firefly-iii/firefly-iii/releases/download/v${RELEASE}/FireflyIII-v${RELEASE}.tar.gz" -o "FireflyIII-v${RELEASE}.tar.gz"
+mkdir -p /opt/firefly
+tar -xzf FireflyIII-v${RELEASE}.tar.gz -C /opt/firefly
 chown -R www-data:www-data /opt/firefly
 chmod -R 775 /opt/firefly/storage
 cd /opt/firefly
@@ -60,7 +69,8 @@ tar -xzf "DataImporter-v${IMPORTER_RELEASE}.tar.gz" -C /opt/firefly/dataimporter
 cp /opt/firefly/dataimporter/.env.example /opt/firefly/dataimporter/.env
 sed -i "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" /opt/firefly/dataimporter/.env
 chown -R www-data:www-data /opt/firefly
-msg_ok "Configured Firefly III"
+echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
+msg_ok "Installed Firefly III"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/apache2/sites-available/firefly.conf
@@ -102,6 +112,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
+rm -rf "/opt/FireflyIII-v${RELEASE}.tar.gz"
 rm -rf "/opt/DataImporter-v${IMPORTER_RELEASE}.tar.gz"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean

install/flaresolverr-install.sh

@@ -15,9 +15,8 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  apt-transport-https \
-  xvfb
+$STD apt-get install -y apt-transport-https
+$STD apt-get install -y xvfb
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Chrome"
@@ -27,7 +26,13 @@ $STD apt update
 $STD apt install -y google-chrome-stable
 msg_ok "Installed Chrome"
 
-fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
+msg_info "Installing FlareSolverr"
+RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
+$STD curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o "flaresolverr_linux_x64.tar.gz"
+$STD tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
+$STD rm flaresolverr_linux_x64.tar.gz
+echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt
+msg_ok "Installed FlareSolverr"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/flaresolverr.service

install/freshrss-install.sh

@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-PHP_VERSION="8.2" PHP_MODULE="curl,xml,mbstring,intl,zip,pgsql,gmp" PHP_APACHE="YES" setup_php
+PHP_VERSION="8.2" PHP_MODULE="dom,json,ctype,pgsql,gmp,iconv" PHP_APACHE="YES" setup_php
 PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"

install/ghost-install.sh

@@ -16,19 +16,19 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   nginx \
-  ca-certificates \
-  libjemalloc2
+  ca-certificates
 msg_ok "Installed Dependencies"
 
-setup_mysql
+setup_mariadb
 
 msg_info "Configuring Database"
 DB_NAME=ghost
 DB_USER=ghostuser
 DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mysql -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mysql -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mysql -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
+$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
+$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
+$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
+
 {
   echo "Ghost-Credentials"
   echo "Ghost Database User: $DB_USER"
@@ -37,7 +37,7 @@ $STD mysql -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH
 } >>~/ghost.creds
 msg_ok "Configured MySQL"
 
-NODE_VERSION="22" setup_nodejs
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Installing Ghost CLI"
 $STD npm install ghost-cli@latest -g

install/gitea-install.sh

@@ -19,9 +19,10 @@ $STD apt-get install -y git
 $STD apt-get install -y sqlite3
 msg_ok "Installed Dependencies"
 
-fetch_and_deploy_gh_release "gitea" "go-gitea/gitea" "singlefile" "latest" "/usr/local/bin" "gitea-*-linux-amd64"
-
-msg_info "Configuring Gitea"
+msg_info "Installing Gitea"
+RELEASE=$(curl -fsSL https://github.com/go-gitea/gitea/releases/latest | grep "title>Release" | cut -d " " -f 4 | sed 's/^v//')
+curl -fsSL "https://github.com/go-gitea/gitea/releases/download/v$RELEASE/gitea-$RELEASE-linux-amd64" -o "gitea-$RELEASE-linux-amd64"
+mv gitea* /usr/local/bin/gitea
 chmod +x /usr/local/bin/gitea
 adduser --system --group --disabled-password --shell /bin/bash --home /etc/gitea gitea >/dev/null
 mkdir -p /var/lib/gitea/{custom,data,log}
@@ -30,7 +31,7 @@ chmod -R 750 /var/lib/gitea/
 chown root:gitea /etc/gitea
 chmod 770 /etc/gitea
 sudo -u gitea ln -s /var/lib/gitea/data/.ssh/ /etc/gitea/.ssh
-msg_ok "Configured Gitea"
+msg_ok "Installed Gitea"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/gitea.service

install/glance-install.sh

@@ -13,9 +13,12 @@ setting_up_container
 network_check
 update_os
 
-fetch_and_deploy_gh_release "glance" "glanceapp/glance" "prebuild" "latest" "/opt/glance" "glance-linux-amd64.tar.gz"
-
-msg_info "Configuring Glance"
+msg_info "Installing Glance"
+RELEASE=$(curl -fsSL https://api.github.com/repos/glanceapp/glance/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+cd /opt
+curl -fsSL "https://github.com/glanceapp/glance/releases/download/v${RELEASE}/glance-linux-amd64.tar.gz" -o "glance-linux-amd64.tar.gz"
+mkdir -p /opt/glance
+tar -xzf glance-linux-amd64.tar.gz -C /opt/glance
 cat <<EOF >/opt/glance/glance.yml
 pages:
   - name: Startpage
@@ -36,7 +39,9 @@ pages:
                   - title: Helper Scripts
                     url: https://github.com/community-scripts/ProxmoxVE
 EOF
-msg_ok "Configured Glance"
+
+echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
+msg_ok "Installed Glance"
 
 msg_info "Creating Service"
 service_path="/etc/systemd/system/glance.service"
@@ -62,6 +67,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
+rm -rf /opt/glance-linux-amd64.tar.gz
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/stirling-pdf-install.sh

@@ -15,6 +15,7 @@ update_os
 
 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y \
+  git \
   automake \
   autoconf \
   libtool \
@@ -24,26 +25,10 @@ $STD apt-get install -y \
   make \
   g++ \
   unpaper \
-  fonts-urw-base35 \
   qpdf \
   poppler-utils
 msg_ok "Installed Dependencies"
 
-PYTHON_VERSION="3.12" setup_uv
-JAVA_VERSION="21" setup_java
-
-read -r -p "${TAB3}Do you want to Stirling-PDF with Login? (no/n = without Login) [Y/n] " response
-response=${response,,} # Convert to lowercase
-login_mode="false"
-if [[ "$response" == "y" || "$response" == "yes" || -z "$response" ]]; then
-  USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "stirling-pdf" "Stirling-Tools/Stirling-PDF" "singlefile" "latest" "/opt/Stirling-PDF" "Stirling-PDF-with-login.jar"
-  mv /opt/Stirling-PDF/Stirling-PDF-with-login.jar /opt/Stirling-PDF/Stirling-PDF.jar
-  touch ~/.Stirling-PDF-login
-  login_mode="true"
-else
-  USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "stirling-pdf" "Stirling-Tools/Stirling-PDF" "singlefile" "latest" "/opt/Stirling-PDF" "Stirling-PDF.jar"
-fi
-
 msg_info "Installing LibreOffice Components"
 $STD apt-get install -y \
   libreoffice-writer \
@@ -52,35 +37,32 @@ $STD apt-get install -y \
   libreoffice-core \
   libreoffice-common \
   libreoffice-base-core \
-  libreoffice-script-provider-python \
-  libreoffice-java-common \
-  unoconv \
-  pngquant \
-  weasyprint
+  python3-uno
 msg_ok "Installed LibreOffice Components"
 
 msg_info "Installing Python Dependencies"
-mkdir -p /tmp/stirling-pdf
-$STD uv venv /opt/.venv
-export PATH="/opt/.venv/bin:$PATH"
-source /opt/.venv/bin/activate
-$STD uv pip install --upgrade pip
-$STD uv pip install \
+$STD apt-get install -y \
+  python3 \
+  python3-pip
+rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
+$STD pip3 install \
+  uno \
   opencv-python-headless \
-  ocrmypdf \
-  pillow \
-  pdf2image
-
-$STD apt-get install -y python3-uno python3-pip
-$STD pip3 install --break-system-packages unoserver
-ln -sf /opt/.venv/bin/python3 /usr/local/bin/python3
-ln -sf /opt/.venv/bin/pip /usr/local/bin/pip
+  unoconv \
+  pngquant \
+  WeasyPrint
 msg_ok "Installed Python Dependencies"
 
+msg_info "Installing Azul Zulu"
+curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xB1998361219BD9C9" -o "/etc/apt/trusted.gpg.d/zulu-repo.asc"
+curl -fsSL "https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb" -o "/zulu-repo_1.0.0-3_all.deb"
+$STD dpkg -i zulu-repo_1.0.0-3_all.deb
+$STD apt-get update
+$STD apt-get -y install zulu17-jdk
+msg_ok "Installed Azul Zulu"
+
 msg_info "Installing JBIG2"
-$STD curl -fsSL -o /tmp/jbig2enc.tar.gz https://github.com/agl/jbig2enc/archive/refs/tags/0.30.tar.gz
-mkdir -p /opt/jbig2enc
-tar -xzf /tmp/jbig2enc.tar.gz -C /opt/jbig2enc --strip-components=1
+$STD git clone https://github.com/agl/jbig2enc /opt/jbig2enc
 cd /opt/jbig2enc
 $STD bash ./autogen.sh
 $STD bash ./configure
@@ -92,46 +74,25 @@ msg_info "Installing Language Packs (Patience)"
 $STD apt-get install -y 'tesseract-ocr-*'
 msg_ok "Installed Language Packs"
 
-msg_info "Creating Environment Variables"
-cat <<EOF >/opt/Stirling-PDF/.env
-# Java tuning
-JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70"
-JAVA_CUSTOM_OPTS=""
-
-# LibreOffice
-PATH=/opt/.venv/bin:/usr/lib/libreoffice/program:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-UNO_PATH=/usr/lib/libreoffice/program
-URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc
-PYTHONPATH=/usr/lib/libreoffice/program:/opt/.venv/lib/python3.12/site-packages
-LD_LIBRARY_PATH=/usr/lib/libreoffice/program
-
-STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf
-TMPDIR=/tmp/stirling-pdf
-TEMP=/tmp/stirling-pdf
-TMP=/tmp/stirling-pdf
-
-# Paths
-PATH=/opt/.venv/bin:/usr/lib/libreoffice/program:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-EOF
-
-if [[ "$login_mode" == "true" ]]; then
-  cat <<EOF >>/opt/Stirling-PDF/.env
-# activate Login
-DISABLE_ADDITIONAL_FEATURES=false
-SECURITY_ENABLELOGIN=true
-
-# login credentials
-SECURITY_INITIALLOGIN_USERNAME=admin
-SECURITY_INITIALLOGIN_PASSWORD=stirling
-EOF
-fi
-msg_ok "Created Environment Variables"
-
-msg_info "Refreshing Font Cache"
-$STD fc-cache -fv
-msg_ok "Font Cache Updated"
+msg_info "Installing Stirling-PDF (Additional Patience)"
+RELEASE=$(curl -fsSL https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+curl -fsSL "https://github.com/Stirling-Tools/Stirling-PDF/archive/refs/tags/v${RELEASE}.tar.gz" -o "v${RELEASE}.tar.gz"
+tar -xzf v${RELEASE}.tar.gz
+cd Stirling-PDF-$RELEASE
+chmod +x ./gradlew
+$STD ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+mkdir -p /opt/Stirling-PDF
+touch /opt/Stirling-PDF/.env
+mv ./stirling-pdf/build/libs/*.jar /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar
+mv scripts /opt/Stirling-PDF/
+mv pipeline /opt/Stirling-PDF/
+mv stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+ln -s /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar /opt/Stirling-PDF/Stirling-PDF.jar
+ln -s /usr/share/tesseract-ocr/5/tessdata/ /usr/share/tessdata
+msg_ok "Installed Stirling-PDF"
 
 msg_info "Creating Service"
+# Create LibreOffice listener service
 cat <<EOF >/etc/systemd/system/libreoffice-listener.service
 [Unit]
 Description=LibreOffice Headless Listener Service
@@ -148,6 +109,14 @@ Restart=always
 WantedBy=multi-user.target
 EOF
 
+# Set up environment variables
+cat <<EOF >/opt/Stirling-PDF/.env
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/libreoffice/program
+UNO_PATH=/usr/lib/libreoffice/program
+PYTHONPATH=/usr/lib/python3/dist-packages:/usr/lib/libreoffice/program
+LD_LIBRARY_PATH=/usr/lib/libreoffice/program
+EOF
+
 cat <<EOF >/etc/systemd/system/stirlingpdf.service
 [Unit]
 Description=Stirling-PDF service
@@ -170,32 +139,16 @@ RestartSec=10
 WantedBy=multi-user.target
 EOF
 
-cat <<EOF >/etc/systemd/system/unoserver.service
-[Unit]
-Description=UnoServer RPC Interface
-After=libreoffice-listener.service
-Requires=libreoffice-listener.service
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/unoserver --port 2003 --interface 127.0.0.1
-Restart=always
-EnvironmentFile=/opt/Stirling-PDF/.env
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
+# Enable and start services
 systemctl enable -q --now libreoffice-listener
 systemctl enable -q --now stirlingpdf
-systemctl enable -q --now unoserver
 msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f /tmp/jbig2enc.tar.gz
+rm -rf v${RELEASE}.tar.gz /zulu-repo_1.0.0-3_all.deb
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"