free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Choosing apps

This commit is contained in:
Bob Mottram 2016-09-30 23:47:08 +01:00
parent 14fd98f08e
commit 16a4344257
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone-utils-selector
View File

@ -217,6 +217,7 @@ 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
if [[ $(app_is_removed ${a}) == "0" ]]; then
APPS_CHOSEN+=("1") APPS_CHOSEN+=("1")
else else
APPS_CHOSEN+=("0") APPS_CHOSEN+=("0")
@ -224,6 +225,9 @@ function choose_apps_for_variant {
else else
APPS_CHOSEN+=("0") APPS_CHOSEN+=("0")
fi fi
else
APPS_CHOSEN+=("0")
fi
fi fi
done done
@ -271,11 +275,13 @@ 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
if [[ $(app_is_removed ${a}) == "0" ]]; then
install_interactive_${a} install_interactive_${a}
fi fi
fi fi
fi fi
fi fi
fi
app_index=$[app_index+1] app_index=$[app_index+1]
done done
@ -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}"