From c834d436ef7b29e1627ea9b0adcda07de65730b1 Mon Sep 17 00:00:00 2001
From: Gary <pgx7aiqs@anonaddy.me>
Date: Fri, 23 Feb 2024 15:06:09 -0800
Subject: [PATCH] main: simplify launch scripts

---
 scripts/local_install.sh | 14 +++++---------
 scripts/upgrade.sh       |  7 +------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/scripts/local_install.sh b/scripts/local_install.sh
index a07fc5cad..a1f027e86 100644
--- a/scripts/local_install.sh
+++ b/scripts/local_install.sh
@@ -197,9 +197,10 @@ fi
 
 echo -e "-------------"
 #add directories here that you want to modify
-mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,tailwind}
-mkdir -p /data/coolify/ssh/{keys,mux}
-mkdir -p /data/coolify/proxy/dynamic
+mkdir -p /data/coolify/storage/app/{ssh,applications,databases,backups,services,proxy}
+mkdir -p /data/coolify/source/
+mkdir -p /data/coolify/storage/app/ssh/{keys,mux}
+mkdir -p /data/coolify/storage/app/proxy/dynamic
 
 # echo "Downloading required files from CDN..."
 # curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
@@ -212,12 +213,7 @@ cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-c
 cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml
 cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production
 cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh
-cp -r /home/lasthour/lasthourcloud/public/ /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Notifications /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Models /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Livewire /data/coolify/
-cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo
-cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/
+cp -r /home/lasthour/lasthourcloud/ /data/coolify/
 
 chown -R 9999:root /data/coolify
 chmod -R 700 /data/coolify
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 78c8094a6..1103d6287 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -13,12 +13,7 @@ cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-c
 cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml
 cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production
 cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh
-cp -r /home/lasthour/lasthourcloud/public/ /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Notifications /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Models /data/coolify/
-cp -r /home/lasthour/lasthourcloud/app/Livewire /data/coolify/
-cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo
-cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/
+cp -r /home/lasthour/lasthourcloud/ /data/coolify/
 
 # Merge .env and .env.production. New values will be added to .env
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env