Bläddra i källkod

Choosing apps

Bob Mottram 8 år sedan
förälder
incheckning
16a4344257
1 ändrade filer med 10 tillägg och 4 borttagningar
  1. 10
    4
      src/freedombone-utils-selector

+ 10
- 4
src/freedombone-utils-selector Visa fil

@@ -217,7 +217,11 @@ function choose_apps_for_variant {
217 217
                       "${variants_list}" == "$variant_name "* || \
218 218
                       "${variants_list}" == *" $variant_name "* || \
219 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 225
                 else
222 226
                     APPS_CHOSEN+=("0")
223 227
                 fi
@@ -271,7 +275,9 @@ function install_apps {
271 275
                 if [ ${is_interactive} ]; then
272 276
                     # interactively obtain settings for this app
273 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 281
                     fi
276 282
                 fi
277 283
             fi
@@ -286,9 +292,9 @@ function install_apps {
286 292
             if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
287 293
                 if [ ${is_interactive} ]; then
288 294
                     reinstall_app ${a}
289
-                    echo $"Installing application: ${a}"
295
+                    echo $"Installing application from interactive: ${a}"
290 296
                     install_${a}
291
-                    echo $"${a} was installed"
297
+                    echo $"${a} was installed from interactive"
292 298
                 else
293 299
                     if [[ $(app_is_removed ${a}) == "0" ]]; then
294 300
                         echo $"Installing application: ${a}"