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

Remove redundant function

This commit is contained in:
Bob Mottram 2018-05-09 16:14:31 +01:00
parent 992bde2f97
commit ddb9b7a353
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedombone-addremove
View File

@ -80,20 +80,6 @@ function mark_unselected_apps_as_removed {
done done
} }
function app_not_on_onion_only {
app_name="$1"
read_config_param ONION_ONLY
if [[ "$ONION_ONLY" != 'no' ]]; then
if grep -q "NOT_ON_ONION=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
echo "0"
return
fi
fi
echo "1"
}
function app_expected_to_be_installed { function app_expected_to_be_installed {
# is the given application expected to be installed by default? # is the given application expected to be installed by default?
select_all_apps="$1" select_all_apps="$1"

28
src/freedombone-utils-selector
View File

@ -272,6 +272,20 @@ function get_apps_installed_names {
done done
} }
function app_not_on_onion_only {
app_name="$1"
read_config_param ONION_ONLY
if [[ "$ONION_ONLY" != 'no' ]]; then
if grep -q "NOT_ON_ONION=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
echo "0"
return
fi
fi
echo "1"
}
# detects what apps are available # detects what apps are available
function detect_apps { function detect_apps {
FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*" FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
@ -299,20 +313,6 @@ function detect_apps {
get_apps_installed_names get_apps_installed_names
} }
function app_not_on_onion_only {
app_name="$1"
read_config_param ONION_ONLY
if [[ "$ONION_ONLY" != 'no' ]]; then
if grep -q "NOT_ON_ONION=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
echo "0"
return
fi
fi
echo "1"
}
# detects what apps are available and can be installed # detects what apps are available and can be installed
# If the variants list within an app script is an empty string then # If the variants list within an app script is an empty string then
# it is considered to be too experimental to be installable # it is considered to be too experimental to be installable