From 6a87d72e5dde626eb94ed420cfd575c7c3e0ed3f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 30 Jul 2018 11:10:00 +0100
Subject: [PATCH] Handle case where web admin language subdir doesn't exist
---
src/freedombone-utils-webadmin | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 96d972470..3733c5781 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -441,10 +441,20 @@ function install_web_admin {
mkdir -p "/var/www/${local_hostname}/htdocs/admin"
fi
+ web_admin_installed=
if [ -d "/usr/share/${PROJECT_NAME}/webadmin" ]; then
- cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "/var/www/${local_hostname}/htdocs/admin"
- cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "/var/www/${local_hostname}/htdocs/admin"
+ if [ -d "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}" ]; then
+ cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "/var/www/${local_hostname}/htdocs/admin"
+ cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "/var/www/${local_hostname}/htdocs/admin"
+ web_admin_installed=1
+ else
+ echo $"No web admin language subdirectory for ${language_subdir}"
+ fi
else
+ echo $"Directory not found /usr/share/${PROJECT_NAME}/webadmin"
+ fi
+
+ if [ ! $web_admin_installed ]; then
placeholderstr=$"This is a placeholder for the web admin panel on ${local_hostname}"
{ echo '<html>';
echo ' <body>';
--
GitLab