|
@@ -309,6 +309,11 @@ function detect_installable_apps {
|
309
|
309
|
function choose_apps_for_variant {
|
310
|
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
|
317
|
FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
|
313
|
318
|
|
314
|
319
|
APPS_CHOSEN=()
|
|
@@ -319,9 +324,7 @@ function choose_apps_for_variant {
|
319
|
324
|
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
|
320
|
325
|
|
321
|
326
|
item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"
|
322
|
|
- if [[ $? != 0 ]]; then
|
323
|
|
- APPS_AVAILABLE+=("${app_name}")
|
324
|
|
-
|
|
327
|
+ if [[ $? == 0 ]]; then
|
325
|
328
|
if grep -q "VARIANTS=" ${filename}; then
|
326
|
329
|
variants_list=$(app_variants $filename)
|
327
|
330
|
if [[ "${variants_list}" == 'all'* || \
|
|
@@ -341,7 +344,6 @@ function choose_apps_for_variant {
|
341
|
344
|
else
|
342
|
345
|
APPS_CHOSEN+=("0")
|
343
|
346
|
fi
|
344
|
|
-
|
345
|
347
|
fi
|
346
|
348
|
done
|
347
|
349
|
|