The full variant list could get large, so have the potential to have a smaller number of apps installed by default

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

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

src/freedombone-app-dokuwiki

@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim writer'
 
+IN_DEFAULT_INSTALL=1
+
 SHOW_ON_ABOUT=1
 
 DOKUWIKI_DOMAIN_NAME=

src/freedombone-app-emacs

@@ -30,6 +30,8 @@
 
 VARIANTS='full'
 
+IN_DEFAULT_INSTALL=1
+
 emacs_variables=(USB_MOUNT
                  MY_USERNAME)
 

src/freedombone-app-gnusocial

@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim media'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 GNUSOCIAL_DOMAIN_NAME=

src/freedombone-app-gogs

@@ -30,6 +30,7 @@
 
 VARIANTS='developer'
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 GOGS_USERNAME='gogs'

src/freedombone-app-htmly

@@ -30,6 +30,7 @@
 
 VARIANTS="full full-vim writer"
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 HTMLY_DOMAIN_NAME=

src/freedombone-app-hubzilla

@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim social'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 HUBZILLA_DOMAIN_NAME=

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'

src/freedombone-app-irc

@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 IRC_PORT=6697

src/freedombone-app-librevault

@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 PROTOBUF_REPO="https://github.com/google/protobuf"
 PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53'
 

src/freedombone-app-mediagoblin

@@ -30,6 +30,7 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 MEDIAGOBLIN_DOMAIN_NAME=

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

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"

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'

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"

src/freedombone-app-searx

@@ -30,6 +30,7 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 SEARX_REPO="https://github.com/asciimoo/searx"

src/freedombone-app-sip

@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 SIP_SERVER_PASSWORD=

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

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"

src/freedombone-app-tox

@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 TOX_PORT=33445

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'
 

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=

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

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"