|
@@ -69,7 +69,8 @@ function app_load_variables {
|
69
|
69
|
|
70
|
70
|
#shellcheck disable=SC2206
|
71
|
71
|
configvarname=( ${!configvarname} )
|
72
|
|
- for v in "${configvarname[@]}"
|
|
72
|
+ # shellcheck disable=SC2068
|
|
73
|
+ for v in ${configvarname[@]}
|
73
|
74
|
do
|
74
|
75
|
read_config_param "$v"
|
75
|
76
|
done
|
|
@@ -90,7 +91,8 @@ function app_save_variables {
|
90
|
91
|
|
91
|
92
|
#shellcheck disable=SC2206
|
92
|
93
|
configvarname=( ${!configvarname} )
|
93
|
|
- for v in "${configvarname[@]}"
|
|
94
|
+ # shellcheck disable=SC2068
|
|
95
|
+ for v in ${configvarname[@]}
|
94
|
96
|
do
|
95
|
97
|
write_config_param "$v" "${!v}"
|
96
|
98
|
done
|
|
@@ -128,9 +130,10 @@ function available_system_variants {
|
128
|
130
|
system_variants_list=$(app_variants "$filename")
|
129
|
131
|
# shellcheck disable=SC2206
|
130
|
132
|
variants_array=($system_variants_list)
|
131
|
|
- for variant_str in "${variants_array[@]}"
|
|
133
|
+ # shellcheck disable=SC2068
|
|
134
|
+ for variant_str in ${variants_array[@]}
|
132
|
135
|
do
|
133
|
|
- if ! item_in_array "${variant_str}" "${new_available_variants_list[@]}"; then
|
|
136
|
+ if ! item_in_array "${variant_str}" ${new_available_variants_list[@]}; then
|
134
|
137
|
new_available_variants_list+=("$variant_str")
|
135
|
138
|
fi
|
136
|
139
|
done
|
|
@@ -146,7 +149,8 @@ function is_valid_variant {
|
146
|
149
|
function_check available_system_variants
|
147
|
150
|
available_system_variants
|
148
|
151
|
|
149
|
|
- for variant_str in "${available_variants_list[@]}"
|
|
152
|
+ # shellcheck disable=SC2068
|
|
153
|
+ for variant_str in ${available_variants_list[@]}
|
150
|
154
|
do
|
151
|
155
|
if [[ "$sys_type" == "$variant_str" ]]; then
|
152
|
156
|
return "1"
|
|
@@ -161,7 +165,8 @@ function show_available_variants {
|
161
|
165
|
function_check available_system_variants
|
162
|
166
|
available_system_variants
|
163
|
167
|
|
164
|
|
- for variant_str in "${available_variants_list[@]}"
|
|
168
|
+ # shellcheck disable=SC2068
|
|
169
|
+ for variant_str in ${available_variants_list[@]}
|
165
|
170
|
do
|
166
|
171
|
echo " $variant_str"
|
167
|
172
|
done
|
|
@@ -250,7 +255,8 @@ function install_completed {
|
250
|
255
|
|
251
|
256
|
# populates an array of "0" or "1" for whether apps are installed
|
252
|
257
|
function get_apps_installed {
|
253
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
258
|
+ # shellcheck disable=SC2068
|
|
259
|
+ for a in ${APPS_AVAILABLE[@]}
|
254
|
260
|
do
|
255
|
261
|
APPS_INSTALLED+=("$(app_is_installed "$a")")
|
256
|
262
|
done
|
|
@@ -259,7 +265,8 @@ function get_apps_installed {
|
259
|
265
|
# populates an array of installed app names
|
260
|
266
|
function get_apps_installed_names {
|
261
|
267
|
APPS_INSTALLED_NAMES=()
|
262
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
268
|
+ # shellcheck disable=SC2068
|
|
269
|
+ for a in ${APPS_AVAILABLE[@]}
|
263
|
270
|
do
|
264
|
271
|
if [[ $(app_is_installed "$a") == "1" ]]; then
|
265
|
272
|
APPS_INSTALLED_NAMES+=("$a")
|
|
@@ -281,7 +288,8 @@ function detect_apps {
|
281
|
288
|
do
|
282
|
289
|
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
|
283
|
290
|
|
284
|
|
- if ! item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"; then
|
|
291
|
+ # shellcheck disable=SC2068
|
|
292
|
+ if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
|
285
|
293
|
APPS_AVAILABLE+=("${app_name}")
|
286
|
294
|
APPS_CHOSEN+=("0")
|
287
|
295
|
fi
|
|
@@ -312,7 +320,8 @@ function detect_installable_apps {
|
312
|
320
|
do
|
313
|
321
|
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
|
314
|
322
|
|
315
|
|
- if ! item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"; then
|
|
323
|
+ # shellcheck disable=SC2068
|
|
324
|
+ if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
|
316
|
325
|
variants_list=$(app_variants "$filename")
|
317
|
326
|
# check for empty string
|
318
|
327
|
if [ ${#variants_list} -gt 0 ]; then
|
|
@@ -344,7 +353,8 @@ function detect_installed_apps {
|
344
|
353
|
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
|
345
|
354
|
|
346
|
355
|
if [[ $(app_is_installed "$app_name") == "1" ]]; then
|
347
|
|
- if ! item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"; then
|
|
356
|
+ # shellcheck disable=SC2068
|
|
357
|
+ if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
|
348
|
358
|
variants_list=$(app_variants "$filename")
|
349
|
359
|
if [ ${#variants_list} -gt 0 ]; then
|
350
|
360
|
APPS_AVAILABLE+=("${app_name}")
|
|
@@ -378,7 +388,8 @@ function choose_apps_for_variant {
|
378
|
388
|
do
|
379
|
389
|
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
|
380
|
390
|
|
381
|
|
- if item_in_array "${app_name}" "${APPS_AVAILABLE[@]}"; then
|
|
391
|
+ # shellcheck disable=SC2068
|
|
392
|
+ if item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
|
382
|
393
|
if grep -q "VARIANTS=" "${filename}"; then
|
383
|
394
|
variants_list=$(app_variants "$filename")
|
384
|
395
|
if [[ "${variants_list}" == 'all'* || \
|
|
@@ -408,7 +419,8 @@ function choose_apps_for_variant {
|
408
|
419
|
# show a list of apps which have been chosen
|
409
|
420
|
function list_chosen_apps {
|
410
|
421
|
app_index=0
|
411
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
422
|
+ # shellcheck disable=SC2068
|
|
423
|
+ for a in ${APPS_AVAILABLE[@]}
|
412
|
424
|
do
|
413
|
425
|
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
|
414
|
426
|
echo $"${a}"
|
|
@@ -419,7 +431,8 @@ function list_chosen_apps {
|
419
|
431
|
|
420
|
432
|
function remove_apps {
|
421
|
433
|
app_index=0
|
422
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
434
|
+ # shellcheck disable=SC2068
|
|
435
|
+ for a in ${APPS_AVAILABLE[@]}
|
423
|
436
|
do
|
424
|
437
|
if [[ ${APPS_INSTALLED[$app_index]} == "1" ]]; then
|
425
|
438
|
if [[ ${APPS_CHOSEN[$app_index]} == "0" ]]; then
|
|
@@ -450,7 +463,8 @@ function remove_apps {
|
450
|
463
|
function install_apps_interactive {
|
451
|
464
|
echo $"Interactive installer"
|
452
|
465
|
app_index=0
|
453
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
466
|
+ # shellcheck disable=SC2068
|
|
467
|
+ for a in ${APPS_AVAILABLE[@]}
|
454
|
468
|
do
|
455
|
469
|
if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
|
456
|
470
|
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
|
|
@@ -546,7 +560,8 @@ function install_apps {
|
546
|
560
|
|
547
|
561
|
# now install the apps
|
548
|
562
|
app_index=0
|
549
|
|
- for a in "${APPS_AVAILABLE[@]}"
|
|
563
|
+ # shellcheck disable=SC2068
|
|
564
|
+ for a in ${APPS_AVAILABLE[@]}
|
550
|
565
|
do
|
551
|
566
|
if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
|
552
|
567
|
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
|