From ec8fb82778a2c1ae18c760840d481faeee2c4e7a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 1 Aug 2018 19:28:34 +0100
Subject: [PATCH] Move files rather than deleting them
---
src/freedombone-installer | 6 ++++++
src/freedombone-utils-webadmin | 15 ++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 2f7c54431..057c11efc 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -42,6 +42,7 @@ setup_file="$webadmin_install_dir/setup.txt"
domain_file="$webadmin_install_dir/.temp_domain.txt"
pending_removes="$webadmin_install_dir/pending_removes.txt"
pending_installs="$webadmin_install_dir/pending_installs.txt"
+INSTALL_DIR=/root/build
while true
do
@@ -145,6 +146,11 @@ do
rm "$domain_file"
fi
+ if [ -d "$INSTALL_DIR/tempwebadmin" ]; then
+ mv "$INSTALL_DIR/tempwebadmin"/* "$webadmin_install_dir"
+ rm -rf "$INSTALL_DIR/tempwebadmin"
+ fi
+
# restart the web server
systemctl restart nginx
fi
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 113f55d07..31abcb995 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -95,7 +95,10 @@ function web_admin_create_users {
if [ -f "$users_file" ]; then
rm "$users_file"
fi
- rm "$webadmin_install_dir/userprofile_"*.html
+ if [ ! -d "$INSTALL_DIR/tempwebadmin" ]; then
+ mkdir -p "$INSTALL_DIR/tempwebadmin"
+ fi
+ mv "$webadmin_install_dir/userprofile_"*.html "$INSTALL_DIR/tempwebadmin"
return
fi
@@ -175,7 +178,10 @@ function web_admin_create_add_apps {
if [ -f "$appslist_add_filename" ]; then
rm "$appslist_add_filename"
fi
- rm "$webadmin_install_dir/app_add_"*.html
+ if [ ! -d "$INSTALL_DIR/tempwebadmin" ]; then
+ mkdir -p "$INSTALL_DIR/tempwebadmin"
+ fi
+ mv "$webadmin_install_dir/app_add_"*.html "$INSTALL_DIR/tempwebadmin"
return
fi
@@ -332,7 +338,10 @@ function web_admin_create_installed_apps {
if [ -f "$appslist_filename" ]; then
rm "$appslist_filename"
fi
- rm "$webadmin_install_dir/app_"*.html
+ if [ ! -d "$INSTALL_DIR/tempwebadmin" ]; then
+ mkdir -p "$INSTALL_DIR/tempwebadmin"
+ fi
+ mv "$webadmin_install_dir/app_"*.html "$INSTALL_DIR/tempwebadmin"
return
fi
--
GitLab