From 1993ec653c4da0a27881d3634dc101ba2f77cdf2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 19 Oct 2016 21:52:59 +0100
Subject: [PATCH] The full variant list could get large, so have the potential
to have a smaller number of apps installed by default
---
src/freedombone-addremove | 4 ++--
src/freedombone-app-dlna | 2 ++
src/freedombone-app-dokuwiki | 2 ++
src/freedombone-app-emacs | 2 ++
src/freedombone-app-gnusocial | 1 +
src/freedombone-app-gogs | 1 +
src/freedombone-app-htmly | 1 +
src/freedombone-app-hubzilla | 1 +
src/freedombone-app-ipfs | 2 ++
src/freedombone-app-irc | 1 +
src/freedombone-app-librevault | 2 ++
src/freedombone-app-mediagoblin | 1 +
src/freedombone-app-mumble | 1 +
src/freedombone-app-pelican | 2 ++
src/freedombone-app-pihole | 2 ++
src/freedombone-app-rss | 1 +
src/freedombone-app-searx | 1 +
src/freedombone-app-sip | 1 +
src/freedombone-app-syncthing | 2 ++
src/freedombone-app-tahoelafs | 1 +
src/freedombone-app-tox | 1 +
src/freedombone-app-vim | 2 ++
src/freedombone-app-webmail | 2 ++
src/freedombone-app-xmpp | 1 +
src/freedombone-app-zeronet | 2 ++
25 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index d49e8f296..59fd26961 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -85,11 +85,11 @@ function app_expected_to_be_installed {
read_config_param ONION_ONLY
if [[ "$select_all_apps" == "add-all" ]]; then
- if [[ "$app_name" == "vim" ]]; then
+ if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla" ]]; then
echo "0"
return
fi
- if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla" ]]; then
+ if ! grep -q "IN_DEFAULT_INSTALL=1" /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}; then
echo "0"
return
fi
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index 1bda0405a..9f188d92e 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -30,6 +30,8 @@
VARIANTS='full full-vim media'
+IN_DEFAULT_INSTALL=1
+
dlna_variables=(SYSTEM_TYPE
USB_MOUNT
INSTALLED_WITHIN_DOCKER
diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index acd412677..ebefaff74 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -30,6 +30,8 @@
VARIANTS='full full-vim writer'
+IN_DEFAULT_INSTALL=1
+
SHOW_ON_ABOUT=1
DOKUWIKI_DOMAIN_NAME=
diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index 131e6e241..99667321f 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -30,6 +30,8 @@
VARIANTS='full'
+IN_DEFAULT_INSTALL=1
+
emacs_variables=(USB_MOUNT
MY_USERNAME)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index ae3b55fcf..a93a31d2c 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -30,6 +30,7 @@
VARIANTS='full full-vim media'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
GNUSOCIAL_DOMAIN_NAME=
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 67d4589d8..19004323e 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -30,6 +30,7 @@
VARIANTS='developer'
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
GOGS_USERNAME='gogs'
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 508a1fcae..0a3720845 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -30,6 +30,7 @@
VARIANTS="full full-vim writer"
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
HTMLY_DOMAIN_NAME=
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index f266093d4..34468d933 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -30,6 +30,7 @@
VARIANTS='full full-vim social'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
HUBZILLA_DOMAIN_NAME=
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 0cd0d0f35..fa34b40af 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -30,6 +30,8 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
+
IPFS_GO_REPO_BASE="github.com/ipfs/go-ipfs"
IPFS_GO_REPO='https://github.com/ipfs/go-ipfs'
IPFS_COMMIT='6fdfaaf6e4783ae1be7b348e7a6bc0640982c7df'
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 477747d86..149635bd2 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -30,6 +30,7 @@
VARIANTS='full full-vim chat'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
IRC_PORT=6697
diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault
index d5f25b9c7..b88e76fb6 100755
--- a/src/freedombone-app-librevault
+++ b/src/freedombone-app-librevault
@@ -30,6 +30,8 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
+
PROTOBUF_REPO="https://github.com/google/protobuf"
PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53'
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index ce3e4b216..aaf5a86d0 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -30,6 +30,7 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
MEDIAGOBLIN_DOMAIN_NAME=
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 5c676253c..ad7020d57 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -30,6 +30,7 @@
VARIANTS='full full-vim chat'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
# Password used for mumble server
diff --git a/src/freedombone-app-pelican b/src/freedombone-app-pelican
index 088bcd56b..444d2e4ae 100755
--- a/src/freedombone-app-pelican
+++ b/src/freedombone-app-pelican
@@ -30,6 +30,8 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
+
STATIC_BLOG_INSTALL_DIR=/etc/staticblog
PELICAN_THEMES_REPO="https://github.com/getpelican/pelican-themes"
PELICAN_PLUGINS_REPO="https://github.com/getpelican/pelican-plugins"
diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index 6ecadbd63..a47c57c53 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -33,6 +33,8 @@
VARIANTS='full full-vim adblocker'
+IN_DEFAULT_INSTALL=1
+
PIHOLE_IFACE=eth0
PIHOLE_DNS1='85.214.73.63'
PIHOLE_DNS2='213.73.91.35'
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 6c7d75680..cee9a07cd 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -30,6 +30,7 @@
VARIANTS='full full-vim writer'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
RSS_READER_REPO="https://tt-rss.org/git/tt-rss.git"
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index 6525ac18f..164b56fa2 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -30,6 +30,7 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
SEARX_REPO="https://github.com/asciimoo/searx"
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index 967f51f4a..3163c66b5 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -30,6 +30,7 @@
VARIANTS='full full-vim chat'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
SIP_SERVER_PASSWORD=
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 6650349a6..08f28d6a3 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -30,6 +30,8 @@
VARIANTS='full full-vim cloud'
+IN_DEFAULT_INSTALL=1
+
SYNCTHING_ID=
SYNCTHING_CONFIG_PATH=/root/.config/syncthing
SYNCTHING_CONFIG_FILE=$SYNCTHING_CONFIG_PATH/config.xml
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 114701127..9965b8f75 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -30,6 +30,7 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 38eb5617d..10ebd851d 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -30,6 +30,7 @@
VARIANTS='full full-vim chat'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
TOX_PORT=33445
diff --git a/src/freedombone-app-vim b/src/freedombone-app-vim
index 4ee5664c8..1a09953bd 100755
--- a/src/freedombone-app-vim
+++ b/src/freedombone-app-vim
@@ -30,6 +30,8 @@
VARIANTS='full-vim'
+IN_DEFAULT_INSTALL=0
+
VIM_TEMP_DIR='.vimtemp'
VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/ +9'
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 088c0dbfd..47542deb0 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -30,6 +30,8 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
+
WEBMAIL_REPO="https://github.com/roundcube/roundcubemail"
WEBMAIL_COMMIT='78cf9c2e5cff2d78cd8beb647d60570f195a2a9c'
WEBMAIL_ONION_HOSTNAME=
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 8a8627e72..175301bc0 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -30,6 +30,7 @@
VARIANTS='full full-vim chat'
+IN_DEFAULT_INSTALL=1
SHOW_ON_ABOUT=1
# Directory where XMPP settings are stored
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index d60ed2e7a..7a2e21ede 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -30,6 +30,8 @@
VARIANTS=''
+IN_DEFAULT_INSTALL=0
+
MESH_INSTALL_DIR=/var/lib
ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"
--
GitLab