Merge 84e5fafd0d into 4dcf0dc0b8

Update CHANGELOG.md (#1617 )
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2025-01-26 18:46:18 +00:00 · 2025-01-21 01:23:08 +01:00 · 2025-01-20 18:04:18 +01:00 · 2025-01-20 18:03:27 +01:00 · 2025-01-20 17:25:02 +01:00 · 2024-11-19 21:28:44 +13:00
3 changed files with 160 additions and 46 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -28,8 +28,8 @@ Do not break established syntax in this file, as it is automatically updated by

 ### 🚀 Updated Scripts

+- Update Kimai Dependency: Use PHP 8.3 [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
 - Feature: Add xCaddy for external Modules on Caddy-LXC [@MickLesk](https://github.com/MickLesk) ([#1613](https://github.com/community-scripts/ProxmoxVE/pull/1613))
- Update Kimai Dependency: Use PHP 8.4  [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
 - Fix Pocketbase URL after install [@MickLesk](https://github.com/MickLesk) ([#1597](https://github.com/community-scripts/ProxmoxVE/pull/1597))
 - Unifi.sh fix wrong URL after Install [@thost96](https://github.com/thost96) ([#1601](https://github.com/community-scripts/ProxmoxVE/pull/1601))

@ -40,6 +40,7 @@ Do not break established syntax in this file, as it is automatically updated by

 ### 🧰 Maintenance

+- [core] Update build.func: Add defaults to Advanced mode [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1548](https://github.com/community-scripts/ProxmoxVE/pull/1548))
 - Update build.func: Fix Advanced Tags (Remove all if empty / overwrite if default cleared) [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1612](https://github.com/community-scripts/ProxmoxVE/pull/1612))
 - Add new Check for LXC MaxKeys by @cricalix [@MickLesk](https://github.com/MickLesk) ([#1602](https://github.com/community-scripts/ProxmoxVE/pull/1602))

--- a/misc/build.func
+++ b/misc/build.func
@ -382,74 +382,167 @@ exit_script() {
 # This function allows the user to configure advanced settings for the script.
 advanced_settings() {
  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58
-  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
-  if [ "$var_os" != "alpine" ]; then
+  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "Default is: ${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
+    if [ "$var_os" != "alpine" ]; then
+    var_default_os="${var_os}"
    var_os=""
    while [ -z "$var_os" ]; do
-      if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution:" 10 58 2 \
-        "debian" "" OFF \
-        "ubuntu" "" OFF \
-        3>&1 1>&2 2>&3); then
-        if [ -n "$var_os" ]; then
-          echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+        if [ "$var_default_os" == "debian" ]; then
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+            "debian" "" ON \
+            "ubuntu" "" OFF \
+            3>&1 1>&2 2>&3); then
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
+        fi
+        if [ "$var_default_os" == "ubuntu" ]; then
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+            "debian" "" OFF \
+            "ubuntu" "" ON \
+            3>&1 1>&2 2>&3); then
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
        fi
-      else
-        exit_script
-      fi
    done
  fi

  if [ "$var_os" == "debian" ]; then
+    var_default_version="${var_version}"
    var_version=""
    while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
-        "11" "Bullseye" OFF \
-        "12" "Bookworm" OFF \
-        3>&1 1>&2 2>&3); then
-        if [ -n "$var_version" ]; then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+      if [ "$var_default_version" == "11" ]; then  
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+          "11" "Bullseye" ON \
+          "12" "Bookworm" OFF \
+          3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "12" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+          "11" "Bullseye" OFF \
+          "12" "Bookworm" ON \
+          3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
        fi
-      else
-        exit_script
      fi
    done
  fi

  if [ "$var_os" == "ubuntu" ]; then
+    var_default_version="${var_version}"
    var_version=""
    while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-        "20.04" "Focal" OFF \
-        "22.04" "Jammy" OFF \
-        "24.04" "Noble" OFF \
-        "24.10" "Oracular" OFF \
-      3>&1 1>&2 2>&3); then
-        if [ -n "$var_version" ]; then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+      if [ "$var_default_version" == "20.04" ]; then  
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" ON \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "22.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" ON \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" ON \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.10" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" ON \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
        fi
-      else
-        exit_script
      fi
    done
  fi
  # Setting Default Tag for Advanced Settings
  TAGS="community-script;${var_tags:-}"
-
+  CT_DEFAULT_TYPE="${CT_TYPE}"
  CT_TYPE=""
  while [ -z "$CT_TYPE" ]; do
-    if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-      "1" "Unprivileged" OFF \
-      "0" "Privileged" OFF \
-      3>&1 1>&2 2>&3); then
-      if [ -n "$CT_TYPE" ]; then
-        CT_TYPE_DESC="Unprivileged"
-        if [ "$CT_TYPE" -eq 0 ]; then
-          CT_TYPE_DESC="Privileged"
+    if [ "$CT_DEFAULT_TYPE" == "1" ]; then 
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+        "1" "Unprivileged" ON \
+        "0" "Privileged" OFF \
+        3>&1 1>&2 2>&3); then
+        if [ -n "$CT_TYPE" ]; then
+          CT_TYPE_DESC="Unprivileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
        fi
-        echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+      else
+        exit_script
+      fi
+    fi
+    if [ "$CT_DEFAULT_TYPE" == "0" ]; then
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+        "1" "Unprivileged" OFF \
+        "0" "Privileged" ON \
+        3>&1 1>&2 2>&3); then
+        if [ -n "$CT_TYPE" ]; then
+          CT_TYPE_DESC="Unprivileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+        fi
+      else
+        exit_script
      fi
-    else
-      exit_script
    fi
  done

@ -597,7 +690,7 @@ advanced_settings() {
    APT_CACHER=""
    APT_CACHER_IP=""
  else
-    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
+    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for none)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
      APT_CACHER="${APT_CACHER_IP:+yes}"
      echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
    else
@ -612,7 +705,7 @@ advanced_settings() {
  fi
  echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"

-  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
    if [ -z $MTU1 ]; then
      MTU1="Default"
      MTU=""
@ -649,7 +742,7 @@ advanced_settings() {
    exit_script
  fi

-  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
+  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
    if [ -z $MAC1 ]; then
      MAC1="Default"
      MAC=""
@ -661,7 +754,7 @@ advanced_settings() {
    exit_script
  fi

-  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
    if [ -z $VLAN1 ]; then
      VLAN1="Default"
      VLAN=""
--- a/misc/install.func
+++ b/misc/install.func
@ -263,3 +263,23 @@ EOF
    chmod 600 /root/.ssh/authorized_keys
  fi
 }
+
+# This function downloads the latest release of a GitHub repository
+github_download_latest_release() {
+  local user="$1"
+  local repo="$2"
+  local output_file="$3"
+  local tarball_url=$($STD wget -qLO - "https://api.github.com/repos/$user/$repo/releases/latest" | grep '"tarball_url":' | cut -d '"' -f 4)
+  $STD wget -qLO "$output_file" "$tarball_url"
+}
+
+# This function extracts a GitHub release tarball into a target directory
+github_extract_latest_release() {
+  local user="$1"
+  local repo="$2"
+  local output_directory="$3"
+  mkdir -p "$output_directory"
+  github_download_latest_release "$user" "$repo" "/tmp/$repo.tar.gz"
+  tar -xzf "/tmp/$repo.tar.gz" -C "$output_directory" --strip-components 1
+  rm "/tmp/$repo.tar.gz"
+}
Author	SHA1	Message	Date
Paul	f4ee711f24	Merge `84e5fafd0d` into `4dcf0dc0b8`	2025-01-21 01:23:08 +01:00
community-scripts-pr-app[bot]	4dcf0dc0b8	Update CHANGELOG.md (#1617 ) Some checks are pending Shellcheck / Shellcheck (push) Waiting to run Details Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run Details Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-20 18:04:18 +01:00
Michel Roegl-Brunner	81c327c317	[core] Update build.func: Add defaults to Advanced mode (#1548 ) * [core] Update build.func: Add defaults to Advanced mode * Change method * Fix copy mistake	2025-01-20 18:03:27 +01:00
community-scripts-pr-app[bot]	c9eb13a20c	Update CHANGELOG.md (#1615 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-20 17:25:02 +01:00
Paul William	84e5fafd0d	Simplified functions, as per the feedback, also use only wget	2024-11-19 21:28:44 +13:00
Paul William	24a7149794	Adds utility functions to download the latest release of a project from github and untars it. Uses curls and standard gnu tools.	2024-11-18 21:55:50 +13:00