|
@@ -93,8 +93,6 @@ function detect_apps {
|
93
|
93
|
fi
|
94
|
94
|
done
|
95
|
95
|
|
96
|
|
- echo "Apps available: $APPS_AVAILABLE"
|
97
|
|
-
|
98
|
96
|
function_check get_apps_installed
|
99
|
97
|
get_apps_installed
|
100
|
98
|
get_apps_installed_names
|
|
@@ -118,10 +116,13 @@ function choose_apps_for_variant {
|
118
|
116
|
APPS_AVAILABLE+=("${app_name}")
|
119
|
117
|
|
120
|
118
|
if grep -q "VARIANTS=" ${filename}; then
|
121
|
|
- variants_list="$(cat ${filename} | grep "VARIANTS=" | awk -F '=' '{print $2}' | awk -F "'" '{print $2}')"
|
|
119
|
+ variants_line=$(cat ${filename} | grep "VARIANTS=")
|
|
120
|
+ if [[ "$variants_line" == *"'"* ]]; then
|
|
121
|
+ variants_list=$(echo "$variants_line" | awk -F '=' '{print $2}' | awk -F "'" '{print $2}')
|
|
122
|
+ else
|
|
123
|
+ variants_list=$(echo "$variants_line" | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
|
|
124
|
+ fi
|
122
|
125
|
if [[ "${variants_list}" == 'all'* || \
|
123
|
|
- "${variants_list}" == 'any'* || \
|
124
|
|
- "${variants_list}" == 'full'* || \
|
125
|
126
|
"${variants_list}" == "$variant_name "* || \
|
126
|
127
|
"${variants_list}" == *" $variant_name "* || \
|
127
|
128
|
"${variants_list}" == *" $variant_name" ]]; then
|