From e013bc4db9a2c8763ac2e484f96310c51af59977 Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 29 Feb 2024 10:49:13 -0800 Subject: [PATCH] main: change upgrade.sh and local_install.sh --- scripts/local_install.sh | 11 ++++++----- scripts/upgrade.sh | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/local_install.sh b/scripts/local_install.sh index 525c886ec..36f56cb88 100644 --- a/scripts/local_install.sh +++ b/scripts/local_install.sh @@ -212,13 +212,14 @@ 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 -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 -R /home/lasthour/lasthourcloud/resources/views/auth /data/coolify/ cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/ -cp /home/lasthour/lasthourcloud/resources/views/auth /data/coolify/ + chown -R 9999:root /data/coolify chmod -R 700 /data/coolify diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 4fce8ea84..dc2f04473 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -17,9 +17,10 @@ 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 -R /home/lasthour/lasthourcloud/resources/views/auth /data/coolify/ cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/ -cp /home/lasthour/lasthourcloud/resources/views/auth /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