Function parameters

This commit is contained in:
Bob Mottram 2016-10-19 20:35:47 +01:00
parent 03b8a85f98
commit 82b087c46a
1 changed files with 5 additions and 5 deletions

View File

@ -77,7 +77,7 @@ function mark_unselected_apps_as_removed {
done
}
function app_expected_to_not_be_installed {
function app_expected_to_be_installed {
# is the given application expected to be installed by default?
select_all_apps="$1"
app_name="$2"
@ -86,15 +86,15 @@ function app_expected_to_not_be_installed {
if [[ "$select_all_apps" == "add-all" ]]; then
if [[ "$app_name" == "vim" ]]; then
echo "1"
echo "0"
return
fi
if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla" ]]; then
echo "1"
echo "0"
return
fi
fi
echo "0"
echo "1"
}
function show_apps {
@ -107,7 +107,7 @@ function show_apps {
if [[ ${APPS_INSTALLED[$app_index]} == "0" && "$select_all_apps" != "add-all" ]]; then
applist="$applist $n $a off"
else
if [[ $(app_expected_to_not_be_installed) == "1" ]]; then
if [[ $(app_expected_to_be_installed "$select_all_apps" "$a") == "0" ]]; then
applist="$applist $n $a off"
else
applist="$applist $n $a on"