Merge c722f2ed36 into 5b38448107

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

CHANGELOG.md

@@ -31,13 +31,18 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### 🚀 Updated Scripts
 
-- Update Script: Remove Docker Compose Question [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#847](https://github.com/community-scripts/ProxmoxVE/pull/847))
 - Increase Size | Description & Download-URL of Debian VM [@MickLesk](https://github.com/MickLesk) ([#837](https://github.com/community-scripts/ProxmoxVE/pull/837))
+- Update Script: Remove Docker Compose Question [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#847](https://github.com/community-scripts/ProxmoxVE/pull/847))
 
 ### 🌐 Website
 
 - Bump nanoid from 3.3.7 to 3.3.8 in /frontend [@dependabot[bot]](https://github.com/dependabot[bot]) ([#845](https://github.com/community-scripts/ProxmoxVE/pull/845))
 
+### ❔ Unlabelled
+
+- Fix variable name for CT_TYPE override [@remz1337](https://github.com/remz1337) ([#855](https://github.com/community-scripts/ProxmoxVE/pull/855))
+- Keeps the same style after writing the SEARCH icon [@remz1337](https://github.com/remz1337) ([#851](https://github.com/community-scripts/ProxmoxVE/pull/851))
+
 ## 2024-12-13
 
 ### Changed

ct/bookstack.sh

@@ -37,30 +37,38 @@ function update_script() {
     msg_info "Stopping Apache2"
     systemctl stop apache2
     msg_ok "Services Stopped"
-
-    msg_info "Updating ${APP} to ${RELEASE}"
-    cp /opt/bookstack/.env /opt/.env
-    wget -q "https://github.com/BookStackApp/BookStack/archive/refs/tags/v${RELEASE}.zip"
-    unzip -q v${RELEASE}.zip
-    mv BookStack-${RELEASE} /opt/bookstack
-    mv /opt/.env /opt/bookstack/.env
+    
+    msg_info "Updating ${APP} to v${RELEASE}"
+    mv /opt/bookstack /opt/bookstack-backup
+    wget -q --directory-prefix=/root/ "https://github.com/BookStackApp/BookStack/archive/refs/tags/v${RELEASE}.zip"
+    unzip -q ~/v${RELEASE}.zip
+    mv ~/BookStack-${RELEASE} /opt/bookstack
+    cp /opt/bookstack-backup/.env /opt/bookstack/.env
+    cp -r /opt/bookstack-backup/public/uploads/ /opt/bookstack/public/uploads
+    cp -r /opt/bookstack-backup/storage/uploads/ /opt/bookstack/storage/uploads
+    cp -r /opt/bookstack-backup/themes/ /opt/bookstack/themes
     cd /opt/bookstack
     COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev &>/dev/null
     php artisan key:generate --force &>/dev/null
     php artisan migrate --force &>/dev/null
+    chown www-data:www-data -R /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
+    chmod -R 755 /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
+    chmod -R 775 /opt/bookstack/storage /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads
+    chmod -R 640 /opt/bookstack/.env
     echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated ${APP}"
-
+    msg_ok "Updated ${APP} to v${RELEASE}"
+    
     msg_info "Starting Apache2"
     systemctl start apache2
     msg_ok "Started Apache2"
-
+    
     msg_info "Cleaning Up"
-    rm -rf v${RELEASE}.zip
+    rm -rf /opt/bookstack-backup
+    rm -rf ~/v${RELEASE}.zip
     msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
-    msg_ok "No update required. ${APP} is already at ${RELEASE}"
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
   fi
   exit
 }

misc/build.func

@@ -204,7 +204,7 @@ base_settings() {
   TAGS="community-script;"
   
   # Override default settings with variables from ct script
-  CT_TYPE=${var_privileged:-$CT_TYPE}
+  CT_TYPE=${var_unprivileged:-$CT_TYPE}
   DISK_SIZE=${var_disk:-$DISK_SIZE}
   CORE_COUNT=${var_cpu:-$CORE_COUNT}
   RAM_SIZE=${var_ram:-$RAM_SIZE}
@@ -611,7 +611,7 @@ install_script() {
         ;;
       2)
         header_info
-        echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings (${SEARCH} Verbose)${CL}"
+        echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings (${SEARCH}${BOLD}${BL} Verbose)${CL}"
         VERB="yes"
         base_settings "$VERB"  
         echo_default