Bob Mottram 7 years ago
parent
commit
d59aa5dac9
1 changed files with 17 additions and 20 deletions
  1. 17
    20
      src/freedombone-utils-android

+ 17
- 20
src/freedombone-utils-android View File

51
             app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
51
             app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
52
             if [ -f "$app_filename" ]; then
52
             if [ -f "$app_filename" ]; then
53
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
53
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
54
-                "${app_name_upper}_SHORT_DESCRIPTION"=
55
-                "${app_name_upper}_DESCRIPTION"=
56
-                "${app_name_upper}_ICON_URL"=
57
-                "${app_name_upper}_MOBILE_APP_URL"=
54
+                SHORT_DESCRIPTION=
55
+                DESCRIPTION=
56
+                ICON_URL=
57
+                MOBILE_APP_URL=
58
 
58
 
59
                 if ! grep -q "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
59
                 if ! grep -q "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
60
                     continue
60
                     continue
62
                 if grep -q "#${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
62
                 if grep -q "#${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
63
                     continue
63
                     continue
64
                 fi
64
                 fi
65
-                # shellcheck disable=SC2140
66
-                "${app_name_upper}_SHORT_DESCRIPTION"="$(grep "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename" | head -n 1 | awk -F '=' '{print $2}')"
65
+                SHORT_DESCRIPTION=$(grep "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename" | head -n 1 | sed 's|\$||g' | awk -F '=' '{print $2}')
67
 
66
 
68
                 if grep -q "${app_name_upper}_DESCRIPTION=" "$app_filename"; then
67
                 if grep -q "${app_name_upper}_DESCRIPTION=" "$app_filename"; then
69
-                    # shellcheck disable=SC2140
70
-                    "${app_name_upper}_DESCRIPTION"="$(grep "${app_name_upper}_DESCRIPTION=" "$app_filename" | head -n 1 | awk -F '=' '{print $2}')"
68
+                    DESCRIPTION="$(grep "${app_name_upper}_DESCRIPTION=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | awk -F '=' '{print $2}')"
71
                 fi
69
                 fi
72
                 if grep -q "${app_name_upper}_ICON_URL=" "$app_filename"; then
70
                 if grep -q "${app_name_upper}_ICON_URL=" "$app_filename"; then
73
-                    # shellcheck disable=SC2140
74
-                    "${app_name_upper}_ICON_URL"="$(grep "${app_name_upper}_ICON_URL=" "$app_filename" | head -n 1 | awk -F '=' '{print $2}')"
71
+                    ICON_URL="$(grep "${app_name_upper}_ICON_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | awk -F '=' '{print $2}')"
75
                 fi
72
                 fi
76
                 if grep -q "${app_name_upper}_MOBILE_APP_URL=" "$app_filename"; then
73
                 if grep -q "${app_name_upper}_MOBILE_APP_URL=" "$app_filename"; then
77
-                    # shellcheck disable=SC2140
78
-                    "${app_name_upper}_MOBILE_APP_URL"="$(grep "${app_name_upper}_MOBILE_APP_URL=" "$app_filename" | head -n 1 | awk -F '=' '{print $2}')"
74
+                    MOBILE_APP_URL="$(grep "${app_name_upper}_MOBILE_APP_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | awk -F '=' '{print $2}')"
79
                 fi
75
                 fi
80
 
76
 
81
                 if [ $android_ctr -gt 0 ]; then
77
                 if [ $android_ctr -gt 0 ]; then
84
 
80
 
85
                 { echo '    {';
81
                 { echo '    {';
86
                   echo "      \"name\": \"${app_name}\",";
82
                   echo "      \"name\": \"${app_name}\",";
87
-                  echo "      \"short_description\": \""$((${app_name_upper}_SHORT_DESCRIPTION))"\",";
88
-                  echo "      \"description\": \""$((${app_name_upper}_DESCRIPTION))"\",";
89
-                  echo "      \"icon_url\": \""$((${app_name_upper}_ICON_URL))"\",";
83
+                  echo "      \"short_description\": \"$SHORT_DESCRIPTION\",";
84
+                  echo "      \"description\": \"$DESCRIPTION))\",";
85
+                  echo "      \"icon_url\": \"$ICON_URL\",";
90
                   echo "      \"clients\": ["; } >> "$plinth_api"
86
                   echo "      \"clients\": ["; } >> "$plinth_api"
91
 
87
 
92
-                if [[ $(("${app_name_upper}_DOMAIN_NAME")) && "$app_name" != 'matrix' ]]; then
88
+                domain_name=$(("${app_name_upper}_DOMAIN_NAME"))
89
+                if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then
93
                     { echo '        {';
90
                     { echo '        {';
94
                       echo "          \"name\": \"${app_name}\",";
91
                       echo "          \"name\": \"${app_name}\",";
95
                       echo "          \"platforms\": [";
92
                       echo "          \"platforms\": [";
96
                       echo '            {';
93
                       echo '            {';
97
                       echo '              "type": "web",';
94
                       echo '              "type": "web",';
98
-                      echo "              \"url\": \""$((${app_name_upper}_DOMAIN_NAME))"\"";
95
+                      echo "              \"url\": \"$domain_name\"";
99
                       echo '            }';
96
                       echo '            }';
100
                       echo '          ]';
97
                       echo '          ]';
101
                       echo -n '        }'; } >> "$plinth_api"
98
                       echo -n '        }'; } >> "$plinth_api"
102
                 fi
99
                 fi
103
 
100
 
104
-                if [ $(("${app_name_upper}_MOBILE_APP_URL")) ]; then
105
-                    if [[ $(("${app_name_upper}_DOMAIN_NAME")) && "$app_name" != 'matrix' ]]; then
101
+                if [ "$MOBILE_APP_URL" ]; then
102
+                    if [[ "$domain_name" && "$app_name" != 'matrix' ]]; then
106
                         echo ',' >> "$plinth_api"
103
                         echo ',' >> "$plinth_api"
107
                     fi
104
                     fi
108
                     { echo '        {';
105
                     { echo '        {';
112
                       echo '              "type": "store",';
109
                       echo '              "type": "store",';
113
                       echo '              "os": "android",';
110
                       echo '              "os": "android",';
114
                       echo '              "store_name": "f-droid",';
111
                       echo '              "store_name": "f-droid",';
115
-                      echo "              \"url\": \""$((${app_name_upper}_MOBILE_APP_URL))"\"";
112
+                      echo "              \"url\": \"$MOBILE_APP_URL\"";
116
                       echo '            }';
113
                       echo '            }';
117
                       echo '          ]';
114
                       echo '          ]';
118
                       echo -n '        }'; } >> "$plinth_api"
115
                       echo -n '        }'; } >> "$plinth_api"