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

Handle single or double quotes

parent 64378bb2
No related branches found
No related tags found
No related merge requests found
......@@ -93,8 +93,6 @@ function detect_apps {
fi
done
echo "Apps available: $APPS_AVAILABLE"
function_check get_apps_installed
get_apps_installed
get_apps_installed_names
......@@ -118,10 +116,13 @@ function choose_apps_for_variant {
APPS_AVAILABLE+=("${app_name}")
if grep -q "VARIANTS=" ${filename}; then
variants_list="$(cat ${filename} | grep "VARIANTS=" | awk -F '=' '{print $2}' | awk -F "'" '{print $2}')"
variants_line=$(cat ${filename} | grep "VARIANTS=")
if [[ "$variants_line" == *"'"* ]]; then
variants_list=$(echo "$variants_line" | awk -F '=' '{print $2}' | awk -F "'" '{print $2}')
else
variants_list=$(echo "$variants_line" | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
fi
if [[ "${variants_list}" == 'all'* || \
"${variants_list}" == 'any'* || \
"${variants_list}" == 'full'* || \
"${variants_list}" == "$variant_name "* || \
"${variants_list}" == *" $variant_name "* || \
"${variants_list}" == *" $variant_name" ]]; then
......
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