Browse Source

Fix choosing of apps

Bob Mottram 8 years ago
parent
commit
ef471e69c8
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      src/freedombone-utils-selector

+ 6
- 4
src/freedombone-utils-selector View File

309
 function choose_apps_for_variant {
309
 function choose_apps_for_variant {
310
     variant_name="$1"
310
     variant_name="$1"
311
 
311
 
312
+    if [ ${#variant_name} -eq 0 ]; then
313
+        echo $"No variant name for choosing apps"
314
+        exit 237567
315
+    fi
316
+
312
     FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
317
     FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
313
 
318
 
314
     APPS_CHOSEN=()
319
     APPS_CHOSEN=()
319
         app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
324
         app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
320
 
325
 
321
         item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"
326
         item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"
322
-        if [[ $? != 0 ]]; then
323
-            APPS_AVAILABLE+=("${app_name}")
324
-
327
+        if [[ $? == 0 ]]; then
325
             if grep -q "VARIANTS=" ${filename}; then
328
             if grep -q "VARIANTS=" ${filename}; then
326
                 variants_list=$(app_variants $filename)
329
                 variants_list=$(app_variants $filename)
327
                 if [[ "${variants_list}" == 'all'* || \
330
                 if [[ "${variants_list}" == 'all'* || \
341
             else
344
             else
342
                 APPS_CHOSEN+=("0")
345
                 APPS_CHOSEN+=("0")
343
             fi
346
             fi
344
-
345
         fi
347
         fi
346
     done
348
     done
347
 
349