Skip to content
Snippets Groups Projects
Commit ef471e69 authored by Bob Mottram's avatar Bob Mottram
Browse files

Fix choosing of apps

parent 4acad83e
No related branches found
No related tags found
No related merge requests found
......@@ -309,6 +309,11 @@ function detect_installable_apps {
function choose_apps_for_variant {
variant_name="$1"
if [ ${#variant_name} -eq 0 ]; then
echo $"No variant name for choosing apps"
exit 237567
fi
FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
APPS_CHOSEN=()
......@@ -319,9 +324,7 @@ function choose_apps_for_variant {
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"
if [[ $? != 0 ]]; then
APPS_AVAILABLE+=("${app_name}")
if [[ $? == 0 ]]; then
if grep -q "VARIANTS=" ${filename}; then
variants_list=$(app_variants $filename)
if [[ "${variants_list}" == 'all'* || \
......@@ -341,7 +344,6 @@ function choose_apps_for_variant {
else
APPS_CHOSEN+=("0")
fi
fi
done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment