From 16a434425734951885866256ddcddc52ec13fd0a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 30 Sep 2016 23:47:08 +0100 Subject: [PATCH] Choosing apps --- src/freedombone-utils-selector | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector index 69a823f1..6f50d47d 100755 --- a/src/freedombone-utils-selector +++ b/src/freedombone-utils-selector @@ -217,7 +217,11 @@ function choose_apps_for_variant { "${variants_list}" == "$variant_name "* || \ "${variants_list}" == *" $variant_name "* || \ "${variants_list}" == *" $variant_name" ]]; then - APPS_CHOSEN+=("1") + if [[ $(app_is_removed ${a}) == "0" ]]; then + APPS_CHOSEN+=("1") + else + APPS_CHOSEN+=("0") + fi else APPS_CHOSEN+=("0") fi @@ -271,7 +275,9 @@ function install_apps { if [ ${is_interactive} ]; then # interactively obtain settings for this app if [[ $(function_exists install_interactive_${a}) == "1" ]]; then - install_interactive_${a} + if [[ $(app_is_removed ${a}) == "0" ]]; then + install_interactive_${a} + fi fi fi fi @@ -286,9 +292,9 @@ function install_apps { if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then if [ ${is_interactive} ]; then reinstall_app ${a} - echo $"Installing application: ${a}" + echo $"Installing application from interactive: ${a}" install_${a} - echo $"${a} was installed" + echo $"${a} was installed from interactive" else if [[ $(app_is_removed ${a}) == "0" ]]; then echo $"Installing application: ${a}"