Merge 85eb661c08 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

install/alpine-docker-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
 $STD apk add tzdata
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Docker"

install/alpine-grafana-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Grafana"
 $STD apk add grafana

install/alpine-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/alpine-nextcloud-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add nginx
 msg_ok "Installed Dependencies"
 

install/alpine-vaultwarden-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add argon2
 msg_ok "Installed Dependencies"
 

install/alpine-zigbee2mqtt-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt

install/debian-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/ubuntu-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

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/alpine-install.func

@@ -133,6 +133,14 @@ update_os() {
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update install.func for apt-based systems as appropriate.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  apk add -q curl mc nano newt openssh sudo &>/dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode

misc/install.func

@@ -197,6 +197,15 @@ EOF
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update alpine-install.func to match for apk-based systems when
+# adding a new package.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  apt-get install -y curl mc sudo &> /dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode