From b96ab2849dd3370687f1d4709c43aa312ce32ae3 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 25 May 2018 18:50:32 +0100 Subject: [PATCH] Read domain variables from configuration file --- src/freedombone-utils-android | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/freedombone-utils-android b/src/freedombone-utils-android index 3e37f41e..2393d196 100755 --- a/src/freedombone-utils-android +++ b/src/freedombone-utils-android @@ -81,12 +81,13 @@ function android_update_apps { { echo ' {'; echo " \"name\": \"${app_name}\","; echo " \"short_description\": \"$SHORT_DESCRIPTION\","; - echo " \"description\": \"$DESCRIPTION))\","; + echo " \"description\": \"$DESCRIPTION\","; echo " \"icon_url\": \"$ICON_URL\","; echo " \"clients\": ["; } >> "$plinth_api" + read_config_param "${app_name_upper}_DOMAIN_NAME" domain_name=$(("${app_name_upper}_DOMAIN_NAME")) - if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then + if [[ "$domain_name" != "0" && "$app_name" != 'matrix' ]]; then { echo ' {'; echo " \"name\": \"${app_name}\","; echo " \"platforms\": ["; @@ -99,7 +100,7 @@ function android_update_apps { fi if [ "$MOBILE_APP_URL" ]; then - if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then + if [[ "$domain_name" != "0" && "$app_name" != 'matrix' ]]; then echo ',' >> "$plinth_api" fi { echo ' {';