From 76b24ec257bf21f55e5b74e16bb7fd520e04eb2d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 10:53:25 +0100
Subject: [PATCH] Create addremove script
---
Makefile | 1 +
src/freedombone-addremove | 8 ++++++--
src/freedombone-controlpanel | 2 +-
src/freedombone-prepare-scripts | 3 +++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 1cbb57836..48abd4c02 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,7 @@ uninstall:
rm -rf /etc/${APP}
rm -f ${PREFIX}/bin/control
rm -f ${PREFIX}/bin/controluser
+ rm -f ${PREFIX}/bin/addremove
bash -c "./translate uninstall"
clean:
rm -f \#* \.#* debian/*.substvars debian/*.log src/*~
diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index d2b9c1dd3..0f38e9b8f 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -38,11 +38,13 @@ if [ -f /usr/bin/${PROJECT_NAME} ]; then
PROJECT_INSTALL_DIR=/usr/bin
fi
-source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
-
COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
+# Start including files
+
+source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
+
UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
for f in $UTILS_FILES
do
@@ -55,6 +57,8 @@ do
source $f
done
+# End including files
+
function mark_unselected_apps_as_removed {
# Initially mark the apps not chosen on first install as being removed
# otherwise they may be automatically installed on the next update
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 0eef20e61..0a1df486f 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -2135,7 +2135,7 @@ function menu_top_level {
4) show_firewall;;
5) reset_tripwire;;
6) menu_app_settings;;
- 7) ${PROJECT_NAME}-addremove
+ 7) /usr/local/bin/addremove
if [ ! "$?" = "0" ]; then
any_key
fi
diff --git a/src/freedombone-prepare-scripts b/src/freedombone-prepare-scripts
index 1c8551a1d..625ef296f 100755
--- a/src/freedombone-prepare-scripts
+++ b/src/freedombone-prepare-scripts
@@ -34,12 +34,15 @@ cat /usr/local/bin/${PROJECT_NAME}-vars /usr/share/${PROJECT_NAME}/utils/${PROJE
cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel > /usr/local/bin/control
cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel-user > /usr/local/bin/controluser
+cat /tmp/includescripts /usr/local/bin/freedombone-addremove > /usr/local/bin/addremove
sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/control
sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/controluser
+sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/addremove
chmod +x /usr/local/bin/control
chmod +x /usr/local/bin/controluser
+chmod +x /usr/local/bin/addremove
rm /tmp/includescripts
--
GitLab