From f5a42f2761d6c8bb03fc4f021463cb1399ac7642 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 29 Jul 2018 15:05:24 +0100
Subject: [PATCH] Don't show apps which are pending installation in web admin
---
src/freedombone-utils-webadmin | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 6654e7926..1971df542 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -124,6 +124,7 @@ function web_admin_create_add_apps {
local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
apps_add_template_filename="/var/www/${local_hostname}/htdocs/admin/apps_add_template.html"
appslist_add_filename="/var/www/${local_hostname}/htdocs/admin/apps_add.html"
+ pending_installs="/var/www/${local_hostname}/htdocs/admin/pending_installs.txt"
icons_dir="/var/www/${local_hostname}/htdocs/admin/icons"
app_add_template_filename="/var/www/${local_hostname}/htdocs/admin/app_add_template.html"
FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
@@ -159,6 +160,13 @@ function web_admin_create_add_apps {
app_index=$((app_index+1))
done
+ # check if the app is pending installation
+ if [ -f "$pending_installs" ]; then
+ if grep -q "install_${app_name}" "$pending_installs"; then
+ app_is_installed=1
+ fi
+ fi
+
if [ ! $app_is_installed ]; then
app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
if [ -f "$app_filename" ]; then
--
GitLab