Browse Source

Choosing apps

Bob Mottram 8 years ago
parent
commit
16a4344257
1 changed files with 10 additions and 4 deletions
  1. 10
    4
      src/freedombone-utils-selector

+ 10
- 4
src/freedombone-utils-selector View File

217
                       "${variants_list}" == "$variant_name "* || \
217
                       "${variants_list}" == "$variant_name "* || \
218
                       "${variants_list}" == *" $variant_name "* || \
218
                       "${variants_list}" == *" $variant_name "* || \
219
                       "${variants_list}" == *" $variant_name" ]]; then
219
                       "${variants_list}" == *" $variant_name" ]]; then
220
-                    APPS_CHOSEN+=("1")
220
+                    if [[ $(app_is_removed ${a}) == "0" ]]; then
221
+                        APPS_CHOSEN+=("1")
222
+                    else
223
+                        APPS_CHOSEN+=("0")
224
+                    fi
221
                 else
225
                 else
222
                     APPS_CHOSEN+=("0")
226
                     APPS_CHOSEN+=("0")
223
                 fi
227
                 fi
271
                 if [ ${is_interactive} ]; then
275
                 if [ ${is_interactive} ]; then
272
                     # interactively obtain settings for this app
276
                     # interactively obtain settings for this app
273
                     if [[ $(function_exists install_interactive_${a}) == "1" ]]; then
277
                     if [[ $(function_exists install_interactive_${a}) == "1" ]]; then
274
-                        install_interactive_${a}
278
+                        if [[ $(app_is_removed ${a}) == "0" ]]; then
279
+                            install_interactive_${a}
280
+                        fi
275
                     fi
281
                     fi
276
                 fi
282
                 fi
277
             fi
283
             fi
286
             if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
292
             if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
287
                 if [ ${is_interactive} ]; then
293
                 if [ ${is_interactive} ]; then
288
                     reinstall_app ${a}
294
                     reinstall_app ${a}
289
-                    echo $"Installing application: ${a}"
295
+                    echo $"Installing application from interactive: ${a}"
290
                     install_${a}
296
                     install_${a}
291
-                    echo $"${a} was installed"
297
+                    echo $"${a} was installed from interactive"
292
                 else
298
                 else
293
                     if [[ $(app_is_removed ${a}) == "0" ]]; then
299
                     if [[ $(app_is_removed ${a}) == "0" ]]; then
294
                         echo $"Installing application: ${a}"
300
                         echo $"Installing application: ${a}"