Merge af2d262498 into 5d69a62b47

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -17,6 +17,14 @@ All LXC instances created using this repository come pre-installed with Midnight
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
 
+## 2025-01-19
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Update Opengist.sh: Fix broken backup function [@bvdberg01](https://github.com/bvdberg01) ([#1572](https://github.com/community-scripts/ProxmoxVE/pull/1572))
+
 ## 2025-01-18
 
 ### Changed

README.md

@@ -17,7 +17,7 @@
       <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
     </a> 
     <a href="https://ko-fi.com/community_scripts">
-      <img src="https://img.shields.io/badge/Donate-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
+      <img src="https://img.shields.io/badge/Support-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
     </a>
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/.github/CONTRIBUTING.md">
       <img src="https://img.shields.io/badge/Contribute-ff4785?style=for-the-badge&logo=git&logoColor=white" alt="Contribute" />

ct/opengist.sh

@@ -32,29 +32,35 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
+  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Stopping Service"
     systemctl stop opengist.service
     msg_ok "Stopped Service"
-  apt-get update &>/dev/null
+    
-  apt-get upgrade &>/dev/null
-  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Updating ${APP} to v${RELEASE}"
+    apt-get update &>/dev/null
+    apt-get -y upgrade &>/dev/null
     cd /opt
-    wget -qO "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
+    mv /opt/opengist /opt/opengist-backup
-    rm -rf /opt/opengist
+    wget -q "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
     tar -xzf opengist${RELEASE}-linux-amd64.tar.gz
+    mv /opt/opengist-backup/config.yml /opt/opengist/config.yml
     chmod +x /opt/opengist/opengist
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
-    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
-    apt-get -y autoremove &>/dev/null
-    apt-get -y autoclean &>/dev/null
     msg_ok "Updated ${APP} LXC"
 
     msg_info "Starting Service"
     systemctl start opengist.service
     msg_ok "Started Service"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
+    rm -rf /opt/opengist-backup
+    apt-get -y autoremove &>/dev/null
+    apt-get -y autoclean &>/dev/null
+    msg_ok "Cleaned"
+    msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."
   fi

json/opengist.json

@@ -6,7 +6,7 @@
     ],
     "date_created": "2025-01-14",
     "type": "ct",
-    "updateable": false,
+    "updateable": true,
     "privileged": false,
     "interface_port": 6157,
     "documentation": null,

misc/.app-headers

@@ -1,4 +1,4 @@
-### Generated on 01-18-2025
+### Generated on 01-19-2025
 ##################################################
 
 ### 2fauth.sh

misc/build.func

@@ -336,12 +336,14 @@ 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
+  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 \
+        if [ "$var_default_os" == "debian" ]; then
-        "debian" "" OFF \
+          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
@@ -350,14 +352,29 @@ advanced_settings() {
           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
     done
   fi
 
   if [ "$var_os" == "debian" ]; then
+    var_default_version="${var_version}"
     var_version=""
     while [ -z "$var_version" ]; do
+      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" OFF \
+          "11" "Bullseye" ON \
           "12" "Bookworm" OFF \
           3>&1 1>&2 2>&3); then
           if [ -n "$var_version" ]; then
@@ -366,14 +383,29 @@ advanced_settings() {
         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
+      fi
     done
   fi
 
   if [ "$var_os" == "ubuntu" ]; then
+    var_default_version="${var_version}"
     var_version=""
     while [ -z "$var_version" ]; do
+      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" OFF \
+          "20.04" "Focal" ON \
           "22.04" "Jammy" OFF \
           "24.04" "Noble" OFF \
           "24.10" "Oracular" OFF \
@@ -384,15 +416,59 @@ advanced_settings() {
         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
+      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_DEFAULT_TYPE" == "1" ]; then 
       if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-      "1" "Unprivileged" OFF \
+        "1" "Unprivileged" ON \
         "0" "Privileged" OFF \
         3>&1 1>&2 2>&3); then
         if [ -n "$CT_TYPE" ]; then
@@ -405,6 +481,23 @@ advanced_settings() {
       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
+    fi
   done
 
   while true; do
@@ -551,7 +644,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
@@ -566,7 +659,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=""
@@ -603,7 +696,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=""
@@ -615,7 +708,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=""