From 13f6836130447c89c69cc9720a976e989b7d19fa Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 3 Aug 2018 11:12:16 +0100
Subject: [PATCH] Check that webadmin directory exists
---
src/freedombone-installer | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index a3b5cab95..2b0246d9c 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -346,16 +346,18 @@ do
if [ -f /tmp/.upgrading ]; then
sleep 2
else
- if [ -f "$setup_file" ]; then
- update_progress_bar
- before_setup_runs
- after_setup_has_finished
- sleep 1
- else
- if [ ! -f "$webadmin_install_dir/setup.prev" ]; then
- install_apps_from_webadmin
+ if [ -d "$webadmin_install_dir" ]; then
+ if [ -f "$setup_file" ]; then
+ update_progress_bar
+ before_setup_runs
+ after_setup_has_finished
sleep 1
- remove_apps_from_webadmin
+ else
+ if [ ! -f "$webadmin_install_dir/setup.prev" ]; then
+ install_apps_from_webadmin
+ sleep 1
+ remove_apps_from_webadmin
+ fi
fi
fi
sleep 1
--
GitLab