Selaa lähdekoodia

Read domain variables from configuration file

Bob Mottram 6 vuotta sitten
vanhempi
commit
b96ab2849d
1 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 4
    3
      src/freedombone-utils-android

+ 4
- 3
src/freedombone-utils-android Näytä tiedosto

@@ -81,12 +81,13 @@ function android_update_apps {
81 81
                 { echo '    {';
82 82
                   echo "      \"name\": \"${app_name}\",";
83 83
                   echo "      \"short_description\": \"$SHORT_DESCRIPTION\",";
84
-                  echo "      \"description\": \"$DESCRIPTION))\",";
84
+                  echo "      \"description\": \"$DESCRIPTION\",";
85 85
                   echo "      \"icon_url\": \"$ICON_URL\",";
86 86
                   echo "      \"clients\": ["; } >> "$plinth_api"
87 87
 
88
+                read_config_param "${app_name_upper}_DOMAIN_NAME"
88 89
                 domain_name=$(("${app_name_upper}_DOMAIN_NAME"))
89
-                if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then
90
+                if [[ "$domain_name" != "0" && "$app_name" != 'matrix' ]]; then
90 91
                     { echo '        {';
91 92
                       echo "          \"name\": \"${app_name}\",";
92 93
                       echo "          \"platforms\": [";
@@ -99,7 +100,7 @@ function android_update_apps {
99 100
                 fi
100 101
 
101 102
                 if [ "$MOBILE_APP_URL" ]; then
102
-                    if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then
103
+                    if [[ "$domain_name" != "0" && "$app_name" != 'matrix' ]]; then
103 104
                         echo ',' >> "$plinth_api"
104 105
                     fi
105 106
                     { echo '        {';