Skip to content
Snippets Groups Projects
Commit 16a43442 authored by Bob Mottram's avatar Bob Mottram
Browse files

Choosing apps

parent 14fd98f0
No related branches found
No related tags found
No related merge requests found
...@@ -217,7 +217,11 @@ function choose_apps_for_variant { ...@@ -217,7 +217,11 @@ function choose_apps_for_variant {
"${variants_list}" == "$variant_name "* || \ "${variants_list}" == "$variant_name "* || \
"${variants_list}" == *" $variant_name "* || \ "${variants_list}" == *" $variant_name "* || \
"${variants_list}" == *" $variant_name" ]]; then "${variants_list}" == *" $variant_name" ]]; then
APPS_CHOSEN+=("1") if [[ $(app_is_removed ${a}) == "0" ]]; then
APPS_CHOSEN+=("1")
else
APPS_CHOSEN+=("0")
fi
else else
APPS_CHOSEN+=("0") APPS_CHOSEN+=("0")
fi fi
...@@ -271,7 +275,9 @@ function install_apps { ...@@ -271,7 +275,9 @@ function install_apps {
if [ ${is_interactive} ]; then if [ ${is_interactive} ]; then
# interactively obtain settings for this app # interactively obtain settings for this app
if [[ $(function_exists install_interactive_${a}) == "1" ]]; then 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 fi
fi fi
...@@ -286,9 +292,9 @@ function install_apps { ...@@ -286,9 +292,9 @@ function install_apps {
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
if [ ${is_interactive} ]; then if [ ${is_interactive} ]; then
reinstall_app ${a} reinstall_app ${a}
echo $"Installing application: ${a}" echo $"Installing application from interactive: ${a}"
install_${a} install_${a}
echo $"${a} was installed" echo $"${a} was installed from interactive"
else else
if [[ $(app_is_removed ${a}) == "0" ]]; then if [[ $(app_is_removed ${a}) == "0" ]]; then
echo $"Installing application: ${a}" echo $"Installing application: ${a}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment