From 709404e9d30fee92ba0c5ac188d0cc86ea246285 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 9 Aug 2018 23:26:58 +0100
Subject: [PATCH] Don't add apps which have no variants defined
---
src/freedombone-installer | 7 ++++++-
src/freedombone-utils-webadmin | 6 ++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index a6835e1b9..3b6fe46b7 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -96,12 +96,17 @@ function web_admin_create_add_apps {
if [ ! $app_is_installed ]; then
app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
if [ -f "$app_filename" ]; then
+ if grep -q "VARIANTS=''" "$app_filename"; then
+ continue
+ fi
+ if grep -q 'VARIANTS=""' "$app_filename"; then
+ continue
+ fi
# get the icon for the app
icon_filename="/usr/share/${PROJECT_NAME}/android-app/${app_name}.png"
if [ -f "$icon_filename" ]; then
cp "$icon_filename" "$webadmin_install_dir/icons/${app_name}.png"
else
- icon_filename=
continue
fi
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index f1c0e89c3..0f5e448fb 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -244,6 +244,12 @@ function web_admin_create_add_apps {
if [ ! $app_is_installed ]; then
app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
if [ -f "$app_filename" ]; then
+ if grep -q "VARIANTS=''" "$app_filename"; then
+ continue
+ fi
+ if grep -q 'VARIANTS=""' "$app_filename"; then
+ continue
+ fi
# get the icon for the app
icon_filename="/usr/share/${PROJECT_NAME}/android-app/${app_name}.png"
if [ -f "$icon_filename" ]; then
--
GitLab