fix func order

CHANGELOG.md

@@ -10,21 +10,17 @@
 > [!CAUTION]
 Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit the project's popularity for potentially malicious purposes.
 
-## 2025-07-08
-
-### 🚀 Updated Scripts
-
-  - Ollama: fix update script [@lucacome](https://github.com/lucacome) ([#5819](https://github.com/community-scripts/ProxmoxVE/pull/5819))
-
 ## 2025-07-07
 
 ### 🚀 Updated Scripts
 
-  - #### 🐞 Bug Fixes
-
+  - Fix unbound var in pulse.sh [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#5807](https://github.com/community-scripts/ProxmoxVE/pull/5807))
+- Refactor: Docmost [@tremor021](https://github.com/tremor021) ([#5806](https://github.com/community-scripts/ProxmoxVE/pull/5806))
 - Fix/stirling pdf script [@JcMinarro](https://github.com/JcMinarro) ([#5803](https://github.com/community-scripts/ProxmoxVE/pull/5803))
 - gitea-mirror: update repo-url [@CrazyWolf13](https://github.com/CrazyWolf13) ([#5794](https://github.com/community-scripts/ProxmoxVE/pull/5794))
-    - Fix unbound var in pulse.sh [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#5807](https://github.com/community-scripts/ProxmoxVE/pull/5807))
+
+  - #### 🐞 Bug Fixes
+
     - Bookstack: Fix PHP Issue & Bump to PHP 8.3 [@MickLesk](https://github.com/MickLesk) ([#5779](https://github.com/community-scripts/ProxmoxVE/pull/5779))
 
   - #### ✨ New Features
@@ -35,7 +31,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🔧 Refactor
 
-    - Refactor: Docmost [@tremor021](https://github.com/tremor021) ([#5806](https://github.com/community-scripts/ProxmoxVE/pull/5806))
     - Refactor: Baby Buddy [@tremor021](https://github.com/tremor021) ([#5769](https://github.com/community-scripts/ProxmoxVE/pull/5769))
     - Refactor: Changed the way we install BunkerWeb by leveraging the brand new install-bunkerweb.sh [@TheophileDiot](https://github.com/TheophileDiot) ([#5707](https://github.com/community-scripts/ProxmoxVE/pull/5707))
 

ct/ollama.sh

@@ -40,7 +40,6 @@ function update_script() {
     msg_info "Updating Ollama to ${RELEASE}"
     rm -rf /usr/local/lib/ollama
     rm -rf /usr/local/bin/ollama
-    mkdir -p /usr/local/lib/ollama
     tar -xzf "${TMP_TAR}" -C /usr/local/lib/ollama
     ln -sf /usr/local/lib/ollama/bin/ollama /usr/local/bin/ollama
     echo "${RELEASE}" >/opt/Ollama_version.txt

frontend/public/json/versions.json

@@ -1,88 +1,8 @@
 [
-  {
-    "name": "mattermost/mattermost",
-    "version": "preview-v0.1",
-    "date": "2025-06-27T14:35:47Z"
-  },
-  {
-    "name": "docker/compose",
-    "version": "v2.38.2",
-    "date": "2025-07-08T09:35:14Z"
-  },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.22.2132",
-    "date": "2025-07-08T05:52:22Z"
-  },
-  {
-    "name": "Checkmk/checkmk",
-    "version": "v2.4.0p7",
-    "date": "2025-07-08T05:51:08Z"
-  },
-  {
-    "name": "ollama/ollama",
-    "version": "v0.9.5",
-    "date": "2025-07-02T18:39:28Z"
-  },
-  {
-    "name": "steveiliop56/tinyauth",
-    "version": "v3.4.1",
-    "date": "2025-06-11T07:53:44Z"
-  },
-  {
-    "name": "mongodb/mongo",
-    "version": "r8.0.12-rc0",
-    "date": "2025-07-07T23:35:35Z"
-  },
-  {
-    "name": "Stirling-Tools/Stirling-PDF",
-    "version": "v1.0.1",
-    "date": "2025-07-07T23:01:28Z"
-  },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.3.0",
-    "date": "2025-07-02T12:26:44Z"
-  },
-  {
-    "name": "duplicati/duplicati",
-    "version": "v2.1.0.122-2.1.0.122_canary_2025-07-07",
-    "date": "2025-07-07T17:54:52Z"
-  },
-  {
-    "name": "msgbyte/tianji",
-    "version": "v1.23.2",
-    "date": "2025-07-07T16:51:43Z"
-  },
-  {
-    "name": "TandoorRecipes/recipes",
-    "version": "1.5.35",
-    "date": "2025-06-22T08:30:10Z"
-  },
   {
     "name": "VictoriaMetrics/VictoriaMetrics",
-    "version": "pmm-6401-v1.121.0",
-    "date": "2025-07-07T16:16:13Z"
-  },
-  {
-    "name": "n8n-io/n8n",
-    "version": "n8n@1.100.0",
-    "date": "2025-06-23T12:48:35Z"
-  },
-  {
-    "name": "photoprism/photoprism",
-    "version": "250707-d28b3101e",
-    "date": "2025-07-07T15:15:21Z"
-  },
-  {
-    "name": "traccar/traccar",
-    "version": "v6.8.1",
-    "date": "2025-07-07T14:40:11Z"
-  },
-  {
-    "name": "BookStackApp/BookStack",
-    "version": "v25.05.2",
-    "date": "2025-07-07T14:08:25Z"
+    "version": "v1.121.0",
+    "date": "2025-07-07T11:32:39Z"
   },
   {
     "name": "meilisearch/meilisearch",
@@ -94,6 +14,11 @@
     "version": "v1.2.1",
     "date": "2025-07-07T10:11:26Z"
   },
+  {
+    "name": "Checkmk/checkmk",
+    "version": "v2.4.0p7-rc1",
+    "date": "2025-07-07T09:25:01Z"
+  },
   {
     "name": "nzbgetcom/nzbget",
     "version": "v25.2",
@@ -109,6 +34,16 @@
     "version": "v1.5.2",
     "date": "2025-05-11T16:40:55Z"
   },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.22.2125",
+    "date": "2025-07-07T05:56:33Z"
+  },
+  {
+    "name": "mattermost/mattermost",
+    "version": "preview-v0.1",
+    "date": "2025-06-27T14:35:47Z"
+  },
   {
     "name": "MediaBrowser/Emby.Releases",
     "version": "4.9.1.2",
@@ -119,6 +54,11 @@
     "version": "v6.2.20",
     "date": "2025-07-02T04:03:37Z"
   },
+  {
+    "name": "steveiliop56/tinyauth",
+    "version": "v3.4.1",
+    "date": "2025-06-11T07:53:44Z"
+  },
   {
     "name": "slskd/slskd",
     "version": "0.23.1",
@@ -154,6 +94,21 @@
     "version": "v1.30.0",
     "date": "2025-07-01T11:29:11Z"
   },
+  {
+    "name": "traccar/traccar",
+    "version": "v6.8.0",
+    "date": "2025-07-06T18:19:05Z"
+  },
+  {
+    "name": "msgbyte/tianji",
+    "version": "v1.23.0",
+    "date": "2025-07-06T16:01:58Z"
+  },
+  {
+    "name": "TandoorRecipes/recipes",
+    "version": "1.5.35",
+    "date": "2025-06-22T08:30:10Z"
+  },
   {
     "name": "Part-DB/Part-DB-server",
     "version": "v1.17.2",
@@ -239,6 +194,11 @@
     "version": "2.37.0",
     "date": "2025-07-04T14:49:43Z"
   },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.3.0",
+    "date": "2025-07-02T12:26:44Z"
+  },
   {
     "name": "Graylog2/graylog2-server",
     "version": "6.3.1",
@@ -274,6 +234,11 @@
     "version": "310.5",
     "date": "2025-07-03T14:05:25Z"
   },
+  {
+    "name": "n8n-io/n8n",
+    "version": "n8n@1.100.0",
+    "date": "2025-06-23T12:48:35Z"
+  },
   {
     "name": "Dolibarr/dolibarr",
     "version": "18.0.7",
@@ -289,6 +254,11 @@
     "version": "v25.7.1",
     "date": "2025-07-03T01:03:18Z"
   },
+  {
+    "name": "mongodb/mongo",
+    "version": "r6.0.25-rc0",
+    "date": "2025-07-03T00:44:52Z"
+  },
   {
     "name": "documenso/documenso",
     "version": "v1.12.2-rc.0",
@@ -304,6 +274,11 @@
     "version": "2.5.1",
     "date": "2025-07-02T19:38:06Z"
   },
+  {
+    "name": "ollama/ollama",
+    "version": "v0.9.5",
+    "date": "2025-07-02T18:39:28Z"
+  },
   {
     "name": "wazuh/wazuh",
     "version": "coverity-w27-4.13.0",
@@ -394,6 +369,11 @@
     "version": "v2.32.0",
     "date": "2025-06-30T22:12:48Z"
   },
+  {
+    "name": "docker/compose",
+    "version": "v2.38.1",
+    "date": "2025-06-30T20:07:35Z"
+  },
   {
     "name": "jhuckaby/Cronicle",
     "version": "v0.9.81",
@@ -509,6 +489,11 @@
     "version": "v1.18.4",
     "date": "2025-06-25T00:06:56Z"
   },
+  {
+    "name": "duplicati/duplicati",
+    "version": "v2.1.0.120-2.1.0.120_canary_2025-06-24",
+    "date": "2025-06-24T22:39:50Z"
+  },
   {
     "name": "evcc-io/evcc",
     "version": "0.204.5",
@@ -649,6 +634,11 @@
     "version": "v2.1.5",
     "date": "2025-06-17T18:04:11Z"
   },
+  {
+    "name": "BookStackApp/BookStack",
+    "version": "v25.05.1",
+    "date": "2025-06-17T14:38:04Z"
+  },
   {
     "name": "crowdsecurity/crowdsec",
     "version": "v1.6.9",
@@ -894,6 +884,11 @@
     "version": "0.5",
     "date": "2025-05-21T20:19:14Z"
   },
+  {
+    "name": "Stirling-Tools/Stirling-PDF",
+    "version": "v0.46.2",
+    "date": "2025-05-20T11:21:04Z"
+  },
   {
     "name": "sbondCo/Watcharr",
     "version": "v2.1.0",
@@ -994,6 +989,11 @@
     "version": "v2.6.3",
     "date": "2025-04-27T09:05:42Z"
   },
+  {
+    "name": "photoprism/photoprism",
+    "version": "250426-27ec7a128",
+    "date": "2025-04-26T11:51:39Z"
+  },
   {
     "name": "TechnitiumSoftware/DnsServer",
     "version": "v13.6.0",

install/bookstack-install.sh

@@ -57,7 +57,7 @@ chmod -R 755 /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public
 chmod -R 775 /opt/bookstack/storage /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads
 chmod -R 640 /opt/bookstack/.env
 $STD a2enmod rewrite
-$STD a2enmod php8.3
+$STD a2enmod php8.2
 msg_ok "Configured Bookstack"
 
 msg_info "Creating Service"

misc/tools.func

@@ -434,7 +434,6 @@ function setup_php() {
     $STD apt-get update
   fi
 
-  local MODULE_LIST="php${PHP_VERSION}"
   for pkg in $MODULE_LIST; do
     if ! apt-cache show "$pkg" >/dev/null 2>&1; then
       msg_error "Package not found: $pkg"
@@ -442,6 +441,7 @@ function setup_php() {
     fi
   done
 
+  local MODULE_LIST="php${PHP_VERSION}"
   IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
     MODULE_LIST+=" php${PHP_VERSION}-${mod}"
@@ -1012,20 +1012,13 @@ function fetch_and_deploy_gh_release() {
 
     filename="${asset_url##*/}"
     mkdir -p "$target"
-
-    local use_filename="${USE_ORIGINAL_FILENAME:-false}"
-    local target_file="$app"
-    [[ "$use_filename" == "true" ]] && target_file="$filename"
-
-    curl $download_timeout -fsSL -o "$target/$target_file" "$asset_url" || {
+    curl $download_timeout -fsSL -o "$target/$app" "$asset_url" || {
       msg_error "Download failed: $asset_url"
       rm -rf "$tmpdir"
       return 1
     }
 
-    if [[ "$target_file" != *.jar && -f "$target/$target_file" ]]; then
-      chmod +x "$target/$target_file"
-    fi
+    chmod +x "$target/$app"
 
   else
     msg_error "Unknown mode: $mode"
@@ -1704,154 +1697,3 @@ function setup_imagemagick() {
   ensure_usr_local_bin_persist
   msg_ok "Setup ImageMagick $VERSION"
 }
-
-# ------------------------------------------------------------------------------
-# Installs FFmpeg from source or prebuilt binary (Debian/Ubuntu only).
-#
-# Description:
-#   - Downloads and builds FFmpeg from GitHub (https://github.com/FFmpeg/FFmpeg)
-#   - Supports specific version override via FFMPEG_VERSION (e.g. n7.1.1)
-#   - Supports build profile via FFMPEG_TYPE:
-#       - minimal : x264, vpx, mp3 only
-#       - medium  : adds subtitles, fonts, opus, vorbis
-#       - full    : adds dav1d, svt-av1, zlib, numa
-#       - binary  : downloads static build (johnvansickle.com)
-#   - Defaults to latest stable version and full feature set
-#
-# Notes:
-#   - Requires: curl, jq, build-essential, and matching codec libraries
-#   - Result is installed to /usr/local/bin/ffmpeg
-# ------------------------------------------------------------------------------
-
-function setup_ffmpeg() {
-  local TMP_DIR
-  TMP_DIR=$(mktemp -d)
-  local GITHUB_REPO="FFmpeg/FFmpeg"
-  local VERSION="${FFMPEG_VERSION:-latest}"
-  local TYPE="${FFMPEG_TYPE:-full}"
-  local BIN_PATH="/usr/local/bin/ffmpeg"
-
-  # Binary fallback mode
-  if [[ "$TYPE" == "binary" ]]; then
-    msg_info "Installing FFmpeg (static binary)"
-    curl -fsSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o "$TMP_DIR/ffmpeg.tar.xz"
-    tar -xf "$TMP_DIR/ffmpeg.tar.xz" -C "$TMP_DIR"
-    local EXTRACTED_DIR
-    EXTRACTED_DIR=$(find "$TMP_DIR" -maxdepth 1 -type d -name "ffmpeg-*")
-    cp "$EXTRACTED_DIR/ffmpeg" "$BIN_PATH"
-    cp "$EXTRACTED_DIR/ffprobe" /usr/local/bin/ffprobe
-    chmod +x "$BIN_PATH" /usr/local/bin/ffprobe
-    rm -rf "$TMP_DIR"
-    msg_ok "Installed FFmpeg binary ($($BIN_PATH -version | head -n1))"
-    return
-  fi
-
-  if ! command -v jq &>/dev/null; then
-    $STD apt-get update
-    $STD apt-get install -y jq
-  fi
-
-  # Auto-detect latest stable version if none specified
-  if [[ "$VERSION" == "latest" || -z "$VERSION" ]]; then
-    msg_info "Resolving latest FFmpeg tag"
-    VERSION=$(curl -fsSL "https://api.github.com/repos/${GITHUB_REPO}/tags" |
-      jq -r '.[].name' |
-      grep -E '^n[0-9]+\.[0-9]+\.[0-9]+$' |
-      sort -V | tail -n1)
-  fi
-
-  if [[ -z "$VERSION" ]]; then
-    msg_error "Could not determine FFmpeg version"
-    rm -rf "$TMP_DIR"
-    return 1
-  fi
-
-  msg_info "Installing FFmpeg ${VERSION} ($TYPE)"
-
-  # Dependency selection
-  local DEPS=(build-essential yasm nasm pkg-config)
-  case "$TYPE" in
-  minimal)
-    DEPS+=(libx264-dev libvpx-dev libmp3lame-dev)
-    ;;
-  medium)
-    DEPS+=(libx264-dev libvpx-dev libmp3lame-dev libfreetype6-dev libass-dev libopus-dev libvorbis-dev)
-    ;;
-  full)
-    DEPS+=(
-      libx264-dev libx265-dev libvpx-dev libmp3lame-dev
-      libfreetype6-dev libass-dev libopus-dev libvorbis-dev
-      libdav1d-dev libsvtav1-dev zlib1g-dev libnuma-dev
-    )
-    ;;
-  *)
-    msg_error "Invalid FFMPEG_TYPE: $TYPE"
-    rm -rf "$TMP_DIR"
-    return 1
-    ;;
-  esac
-
-  $STD apt-get update
-  $STD apt-get install -y "${DEPS[@]}"
-
-  curl -fsSL "https://github.com/${GITHUB_REPO}/archive/refs/tags/${VERSION}.tar.gz" -o "$TMP_DIR/ffmpeg.tar.gz"
-  tar -xzf "$TMP_DIR/ffmpeg.tar.gz" -C "$TMP_DIR"
-  cd "$TMP_DIR/FFmpeg-"* || {
-    msg_error "Source extraction failed"
-    rm -rf "$TMP_DIR"
-    return 1
-  }
-
-  local args=(
-    --enable-gpl
-    --enable-shared
-    --enable-nonfree
-    --disable-static
-    --enable-libx264
-    --enable-libvpx
-    --enable-libmp3lame
-  )
-
-  if [[ "$TYPE" != "minimal" ]]; then
-    args+=(--enable-libfreetype --enable-libass --enable-libopus --enable-libvorbis)
-  fi
-
-  if [[ "$TYPE" == "full" ]]; then
-    args+=(--enable-libx265 --enable-libdav1d --enable-zlib)
-  fi
-
-  if [[ ${#args[@]} -eq 0 ]]; then
-    msg_error "FFmpeg configure args array is empty – aborting."
-    rm -rf "$TMP_DIR"
-    return 1
-  fi
-
-  ./configure "${args[@]}" >"$TMP_DIR/configure.log" 2>&1 || {
-    msg_error "FFmpeg ./configure failed (see $TMP_DIR/configure.log)"
-    cat "$TMP_DIR/configure.log" | tail -n 20
-    rm -rf "$TMP_DIR"
-    return 1
-  }
-
-  $STD make -j"$(nproc)"
-  $STD make install
-  echo "/usr/local/lib" >/etc/ld.so.conf.d/ffmpeg.conf
-  ldconfig
-
-  ldconfig -p | grep libavdevice >/dev/null || {
-    msg_error "libavdevice not registered with dynamic linker"
-    return 1
-  }
-
-  if ! command -v ffmpeg &>/dev/null; then
-    msg_error "FFmpeg installation failed"
-    rm -rf "$TMP_DIR"
-    return 1
-  fi
-
-  local FINAL_VERSION
-  FINAL_VERSION=$(ffmpeg -version | head -n1 | awk '{print $3}')
-  rm -rf "$TMP_DIR"
-  ensure_usr_local_bin_persist
-  msg_ok "Setup FFmpeg $FINAL_VERSION"
-}