From ddb9b7a35339555a7b71f6ca09a813c07b67050c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 9 May 2018 16:14:31 +0100
Subject: [PATCH] Remove redundant function
---
src/freedombone-addremove | 14 --------------
src/freedombone-utils-selector | 28 ++++++++++++++--------------
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index fe170b181..a363af8d3 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -80,20 +80,6 @@ function mark_unselected_apps_as_removed {
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 {
# is the given application expected to be installed by default?
select_all_apps="$1"
diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector
index 077168de2..597b83a73 100755
--- a/src/freedombone-utils-selector
+++ b/src/freedombone-utils-selector
@@ -272,6 +272,20 @@ function get_apps_installed_names {
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
function detect_apps {
FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
@@ -299,20 +313,6 @@ function detect_apps {
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
# If the variants list within an app script is an empty string then
# it is considered to be too experimental to be installable
--
GitLab