From c65282871f49945be8af56233cc4e8789f31273b Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 9 May 2025 23:00:06 +0200
Subject: [PATCH] CT's linkwarden, hass & nextcloud:  Minor fixes -linkwarden:
 Updated `yarn` commands for managing the application -hass: Fixed homefolder
 for hass application user -nextcloud: Bumped php version to project default
 (8.4)

---
 CT-Files/hass/Scripts/Init.sh                 |  2 +-
 CT-Files/linkwarden/Scripts/FirstRun.sh       |  4 ++--
 CT-Files/linkwarden/Scripts/Init.sh           |  8 +++++---
 .../linkwarden/Scripts/Update-linkwarden.sh   | 20 ++++++++++---------
 CT-Files/nextcloud/Scripts/Init.sh            |  2 +-
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CT-Files/hass/Scripts/Init.sh b/CT-Files/hass/Scripts/Init.sh
index 09c807c..bfc7461 100644
--- a/CT-Files/hass/Scripts/Init.sh
+++ b/CT-Files/hass/Scripts/Init.sh
@@ -4,7 +4,7 @@ mkdir -p /opt/HomeAssistant/srv
 mkdir -p /opt/HomeAssistant/data/custom_components/hacs
 touch /opt/HomeAssistant/data/home-assistant.log
 addgroup hass
-adduser -h /opt/HomeAssistant/data -D -G hass -s /bin/sh hass
+adduser -h /opt/HomeAssistant -D -G hass -s /bin/sh hass
 chown -R hass:hass /opt/HomeAssistant
 sudo -u hass python3 -m venv /opt/HomeAssistant/srv
 
diff --git a/CT-Files/linkwarden/Scripts/FirstRun.sh b/CT-Files/linkwarden/Scripts/FirstRun.sh
index cdf6172..db17713 100644
--- a/CT-Files/linkwarden/Scripts/FirstRun.sh
+++ b/CT-Files/linkwarden/Scripts/FirstRun.sh
@@ -26,6 +26,6 @@ sed -i "s#http://localhost:3000#$LinkwardenURL#" /opt/node/linkwarden/.env
 sudo -u node bash << EOF
 (cd /opt/node/linkwarden; yarn prisma migrate deploy)
 pm2 install pm2-logrotate
-pm2 start yarn --name Linkwarden --cwd /opt/node/linkwarden -- start
+pm2 start yarn --name Linkwarden --cwd /opt/node/linkwarden -- concurrently:start
 pm2 save
-EOF
\ No newline at end of file
+EOF
diff --git a/CT-Files/linkwarden/Scripts/Init.sh b/CT-Files/linkwarden/Scripts/Init.sh
index e2545fb..9fa8b8a 100644
--- a/CT-Files/linkwarden/Scripts/Init.sh
+++ b/CT-Files/linkwarden/Scripts/Init.sh
@@ -21,9 +21,11 @@ cd /opt/node/linkwarden
 npx playwright install --with-deps chromium
 rm -rf /root/.cache
 
+
 yarn install
-yarn prisma generate
-yarn build
+yarn prisma:generate
+yarn web:build
+yarn next build
 yarn cache clean
 apt clean
 
@@ -31,4 +33,4 @@ cd $startpath
 cp /opt/node/linkwarden/.env.sample /opt/node/linkwarden/.env
 chown node: -R /opt/node/linkwarden
 su -c "cd /opt/node/linkwarden; npx playwright install chromium" node
-mv /opt/Setup/Scripts/Update-linkwarden.sh /opt/Update-linkwarden.sh
\ No newline at end of file
+mv /opt/Setup/Scripts/Update-linkwarden.sh /opt/Update-linkwarden.sh
diff --git a/CT-Files/linkwarden/Scripts/Update-linkwarden.sh b/CT-Files/linkwarden/Scripts/Update-linkwarden.sh
index b7b18ea..0350bbd 100644
--- a/CT-Files/linkwarden/Scripts/Update-linkwarden.sh
+++ b/CT-Files/linkwarden/Scripts/Update-linkwarden.sh
@@ -6,17 +6,19 @@ if test "$CurLinkwardenVersion" = "$(cat /opt/linkwarden-Version)" ; then
     exit
 else
     echo 'Updating Linkwarden'
-sudo -u node bash << EOF
-    /usr/bin/pm2 stop Linkwarden
+
+sudo -u node /usr/bin/pm2 stop Linkwarden
     cd /opt/node/linkwarden
     git pull
     /usr/bin/yarn install
-    /usr/bin/yarn prisma generate
-    /usr/bin/yarn build
+    /usr/bin/yarn prisma:generate
+    /usr/bin/yarn web:build
+    /usr/bin/yarn next build
     /usr/bin/yarn cache clean
-    /usr/bin/yarn prisma migrate deploy
-    /usr/bin/pm2 start Linkwarden
-    npx playwright install chromium
-EOF
+    /usr/bin/yarn prisma:deploy
+    chown node:node -R /opt/node/linkwarden
+sudo -u node /usr/bin/pm2 start Linkwarden
+
+
     echo "$CurLinkwardenVersion" > /opt/linkwarden-Version
-fi
\ No newline at end of file
+fi
diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh
index 81de277..0344849 100644
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -7,7 +7,7 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Setup PHP
-ash /opt/Setup/Scripts/PHPTool.sh -dv 83 nextcloud || exit 1
+ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud || exit 1
 rm /opt/Setup/Scripts/PHPTool.sh