Explorar el Código

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

Bob Mottram hace 8 años
padre
commit
1993ec653c

+ 2
- 2
src/freedombone-addremove Ver fichero

85
     read_config_param ONION_ONLY
85
     read_config_param ONION_ONLY
86
 
86
 
87
     if [[ "$select_all_apps" == "add-all" ]]; then
87
     if [[ "$select_all_apps" == "add-all" ]]; then
88
-        if [[ "$app_name" == "vim"  ]]; then
88
+        if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla"  ]]; then
89
             echo "0"
89
             echo "0"
90
             return
90
             return
91
         fi
91
         fi
92
-        if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla"  ]]; then
92
+        if ! grep -q "IN_DEFAULT_INSTALL=1" /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}; then
93
             echo "0"
93
             echo "0"
94
             return
94
             return
95
         fi
95
         fi

+ 2
- 0
src/freedombone-app-dlna Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim media'
31
 VARIANTS='full full-vim media'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
34
+
33
 dlna_variables=(SYSTEM_TYPE
35
 dlna_variables=(SYSTEM_TYPE
34
                 USB_MOUNT
36
                 USB_MOUNT
35
                 INSTALLED_WITHIN_DOCKER
37
                 INSTALLED_WITHIN_DOCKER

+ 2
- 0
src/freedombone-app-dokuwiki Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim writer'
31
 VARIANTS='full full-vim writer'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
34
+
33
 SHOW_ON_ABOUT=1
35
 SHOW_ON_ABOUT=1
34
 
36
 
35
 DOKUWIKI_DOMAIN_NAME=
37
 DOKUWIKI_DOMAIN_NAME=

+ 2
- 0
src/freedombone-app-emacs Ver fichero

30
 
30
 
31
 VARIANTS='full'
31
 VARIANTS='full'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
34
+
33
 emacs_variables=(USB_MOUNT
35
 emacs_variables=(USB_MOUNT
34
                  MY_USERNAME)
36
                  MY_USERNAME)
35
 
37
 

+ 1
- 0
src/freedombone-app-gnusocial Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim media'
31
 VARIANTS='full full-vim media'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 GNUSOCIAL_DOMAIN_NAME=
36
 GNUSOCIAL_DOMAIN_NAME=

+ 1
- 0
src/freedombone-app-gogs Ver fichero

30
 
30
 
31
 VARIANTS='developer'
31
 VARIANTS='developer'
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 GOGS_USERNAME='gogs'
36
 GOGS_USERNAME='gogs'

+ 1
- 0
src/freedombone-app-htmly Ver fichero

30
 
30
 
31
 VARIANTS="full full-vim writer"
31
 VARIANTS="full full-vim writer"
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 HTMLY_DOMAIN_NAME=
36
 HTMLY_DOMAIN_NAME=

+ 1
- 0
src/freedombone-app-hubzilla Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim social'
31
 VARIANTS='full full-vim social'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 HUBZILLA_DOMAIN_NAME=
36
 HUBZILLA_DOMAIN_NAME=

+ 2
- 0
src/freedombone-app-ipfs Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 IPFS_GO_REPO_BASE="github.com/ipfs/go-ipfs"
35
 IPFS_GO_REPO_BASE="github.com/ipfs/go-ipfs"
34
 IPFS_GO_REPO='https://github.com/ipfs/go-ipfs'
36
 IPFS_GO_REPO='https://github.com/ipfs/go-ipfs'
35
 IPFS_COMMIT='6fdfaaf6e4783ae1be7b348e7a6bc0640982c7df'
37
 IPFS_COMMIT='6fdfaaf6e4783ae1be7b348e7a6bc0640982c7df'

+ 1
- 0
src/freedombone-app-irc Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim chat'
31
 VARIANTS='full full-vim chat'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 IRC_PORT=6697
36
 IRC_PORT=6697

+ 2
- 0
src/freedombone-app-librevault Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 PROTOBUF_REPO="https://github.com/google/protobuf"
35
 PROTOBUF_REPO="https://github.com/google/protobuf"
34
 PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53'
36
 PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53'
35
 
37
 

+ 1
- 0
src/freedombone-app-mediagoblin Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 MEDIAGOBLIN_DOMAIN_NAME=
36
 MEDIAGOBLIN_DOMAIN_NAME=

+ 1
- 0
src/freedombone-app-mumble Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim chat'
31
 VARIANTS='full full-vim chat'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 # Password used for mumble server
36
 # Password used for mumble server

+ 2
- 0
src/freedombone-app-pelican Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 STATIC_BLOG_INSTALL_DIR=/etc/staticblog
35
 STATIC_BLOG_INSTALL_DIR=/etc/staticblog
34
 PELICAN_THEMES_REPO="https://github.com/getpelican/pelican-themes"
36
 PELICAN_THEMES_REPO="https://github.com/getpelican/pelican-themes"
35
 PELICAN_PLUGINS_REPO="https://github.com/getpelican/pelican-plugins"
37
 PELICAN_PLUGINS_REPO="https://github.com/getpelican/pelican-plugins"

+ 2
- 0
src/freedombone-app-pihole Ver fichero

33
 
33
 
34
 VARIANTS='full full-vim adblocker'
34
 VARIANTS='full full-vim adblocker'
35
 
35
 
36
+IN_DEFAULT_INSTALL=1
37
+
36
 PIHOLE_IFACE=eth0
38
 PIHOLE_IFACE=eth0
37
 PIHOLE_DNS1='85.214.73.63'
39
 PIHOLE_DNS1='85.214.73.63'
38
 PIHOLE_DNS2='213.73.91.35'
40
 PIHOLE_DNS2='213.73.91.35'

+ 1
- 0
src/freedombone-app-rss Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim writer'
31
 VARIANTS='full full-vim writer'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 RSS_READER_REPO="https://tt-rss.org/git/tt-rss.git"
36
 RSS_READER_REPO="https://tt-rss.org/git/tt-rss.git"

+ 1
- 0
src/freedombone-app-searx Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 SEARX_REPO="https://github.com/asciimoo/searx"
36
 SEARX_REPO="https://github.com/asciimoo/searx"

+ 1
- 0
src/freedombone-app-sip Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim chat'
31
 VARIANTS='full full-vim chat'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 SIP_SERVER_PASSWORD=
36
 SIP_SERVER_PASSWORD=

+ 2
- 0
src/freedombone-app-syncthing Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim cloud'
31
 VARIANTS='full full-vim cloud'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
34
+
33
 SYNCTHING_ID=
35
 SYNCTHING_ID=
34
 SYNCTHING_CONFIG_PATH=/root/.config/syncthing
36
 SYNCTHING_CONFIG_PATH=/root/.config/syncthing
35
 SYNCTHING_CONFIG_FILE=$SYNCTHING_CONFIG_PATH/config.xml
37
 SYNCTHING_CONFIG_FILE=$SYNCTHING_CONFIG_PATH/config.xml

+ 1
- 0
src/freedombone-app-tahoelafs Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"
36
 TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"

+ 1
- 0
src/freedombone-app-tox Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim chat'
31
 VARIANTS='full full-vim chat'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 TOX_PORT=33445
36
 TOX_PORT=33445

+ 2
- 0
src/freedombone-app-vim Ver fichero

30
 
30
 
31
 VARIANTS='full-vim'
31
 VARIANTS='full-vim'
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 VIM_TEMP_DIR='.vimtemp'
35
 VIM_TEMP_DIR='.vimtemp'
34
 VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/ +9'
36
 VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/ +9'
35
 
37
 

+ 2
- 0
src/freedombone-app-webmail Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 WEBMAIL_REPO="https://github.com/roundcube/roundcubemail"
35
 WEBMAIL_REPO="https://github.com/roundcube/roundcubemail"
34
 WEBMAIL_COMMIT='78cf9c2e5cff2d78cd8beb647d60570f195a2a9c'
36
 WEBMAIL_COMMIT='78cf9c2e5cff2d78cd8beb647d60570f195a2a9c'
35
 WEBMAIL_ONION_HOSTNAME=
37
 WEBMAIL_ONION_HOSTNAME=

+ 1
- 0
src/freedombone-app-xmpp Ver fichero

30
 
30
 
31
 VARIANTS='full full-vim chat'
31
 VARIANTS='full full-vim chat'
32
 
32
 
33
+IN_DEFAULT_INSTALL=1
33
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
34
 
35
 
35
 # Directory where XMPP settings are stored
36
 # Directory where XMPP settings are stored

+ 2
- 0
src/freedombone-app-zeronet Ver fichero

30
 
30
 
31
 VARIANTS=''
31
 VARIANTS=''
32
 
32
 
33
+IN_DEFAULT_INSTALL=0
34
+
33
 MESH_INSTALL_DIR=/var/lib
35
 MESH_INSTALL_DIR=/var/lib
34
 
36
 
35
 ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"
37
 ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"