From 095501ea79e41d7696f4d7542af284dc46ba346d Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 13 Jan 2026 09:12:09 +0100
Subject: [PATCH] finalize kitchenowl

---
 ct/kitchenowl.sh              | 26 ++++++++++----------------
 install/kitchenowl-install.sh | 10 +++++-----
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/ct/kitchenowl.sh b/ct/kitchenowl.sh
index 25d54663f..7517980d0 100644
--- a/ct/kitchenowl.sh
+++ b/ct/kitchenowl.sh
@@ -34,44 +34,38 @@ function update_script() {
     systemctl stop kitchenowl
     msg_ok "Stopped Service"
 
-    if [[ -d /opt/kitchenowl_backup/data ]]; then
-      msg_ok "Using existing backup from previous update attempt"
-    else
-      msg_info "Backing up KitchenOwl"
-      mkdir -p /opt/kitchenowl_backup
-      cp -r /opt/kitchenowl/data /opt/kitchenowl_backup/
-      cp -f /opt/kitchenowl/kitchenowl.env /opt/kitchenowl_backup/
-      msg_ok "Backed up KitchenOwl"
-    fi
+    msg_info "Backing up KitchenOwl"
+    mkdir -p /opt/kitchenowl_backup
+    cp -r /opt/kitchenowl/data /opt/kitchenowl_backup/
+    cp -f /opt/kitchenowl/kitchenowl.env /opt/kitchenowl_backup/
+    msg_ok "Backed up KitchenOwl"
 
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl" "TomBursch/kitchenowl" "tarball" "latest" "/opt/kitchenowl"
-    sed -i 's/default=True/default=False/' /opt/kitchenowl/backend/wsgi.py
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl-web" "TomBursch/kitchenowl" "prebuild" "latest" "/opt/kitchenowl/web" "kitchenowl_Web.tar.gz"
 
     msg_info "Restoring KitchenOwl data"
+    sed -i 's/default=True/default=False/' /opt/kitchenowl/backend/wsgi.py
     cp -r /opt/kitchenowl_backup/data /opt/kitchenowl/
     cp -f /opt/kitchenowl_backup/kitchenowl.env /opt/kitchenowl/
     rm -rf /opt/kitchenowl_backup
     msg_ok "Restored KitchenOwl data"
 
-    msg_info "Installing Dependencies"
+    msg_info "Updating KitchenOwl"
     cd /opt/kitchenowl/backend
     $STD uv sync --frozen
-    msg_ok "Dependencies installed"
-
-    msg_info "Running Database Migrations"
     cd /opt/kitchenowl/backend
     set -a
     source /opt/kitchenowl/kitchenowl.env
     set +a
     $STD uv run flask db upgrade
-    msg_ok "Database Migrations Complete"
+    msg_ok "Updated KitchenOwl"
 
     msg_info "Starting Service"
     systemctl start kitchenowl
     msg_ok "Started Service"
-    msg_ok "Updated Successfully"
+    msg_ok "Updated successfully!"
   fi
+  exit
 }
 
 start
diff --git a/install/kitchenowl-install.sh b/install/kitchenowl-install.sh
index 9a7d2da3e..6a76d9a55 100644
--- a/install/kitchenowl-install.sh
+++ b/install/kitchenowl-install.sh
@@ -22,11 +22,11 @@ $STD apt install -y \
   libssl-dev
 msg_ok "Installed Dependencies"
 
-PYTHON_VERSION="3.12" setup_uv
-
-CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl" "TomBursch/kitchenowl" "tarball" "latest" "/opt/kitchenowl"
+PYTHON_VERSION="3.13" setup_uv
+import_local_ip
+fetch_and_deploy_gh_release "kitchenowl" "TomBursch/kitchenowl" "tarball" "latest" "/opt/kitchenowl"
 rm -rf /opt/kitchenowl/web
-CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl-web" "TomBursch/kitchenowl" "prebuild" "latest" "/opt/kitchenowl/web" "kitchenowl_Web.tar.gz"
+fetch_and_deploy_gh_release "kitchenowl-web" "TomBursch/kitchenowl" "prebuild" "latest" "/opt/kitchenowl/web" "kitchenowl_Web.tar.gz"
 
 msg_info "Setting up KitchenOwl"
 cd /opt/kitchenowl/backend
@@ -35,7 +35,6 @@ sed -i 's/default=True/default=False/' /opt/kitchenowl/backend/wsgi.py
 mkdir -p /nltk_data
 $STD uv run python -m nltk.downloader -d /nltk_data averaged_perceptron_tagger_eng punkt_tab
 JWT_SECRET=$(openssl rand -hex 32)
-import_local_ip
 mkdir -p /opt/kitchenowl/data
 cat <<EOF >/opt/kitchenowl/kitchenowl.env
 STORAGE_PATH=/opt/kitchenowl/data
@@ -122,6 +121,7 @@ server {
 }
 EOF
 ln -sf /etc/nginx/sites-available/kitchenowl.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
 $STD systemctl reload nginx
 msg_ok "Configured Nginx"