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

Function parameters

parent 03b8a85f
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
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