Преглед изворни кода

Some apps not installable on onion only version

Bob Mottram пре 7 година
родитељ
комит
1af2de4090

+ 22
- 6
src/freedombone-addremove Прегледај датотеку

80
     done
80
     done
81
 }
81
 }
82
 
82
 
83
+function app_not_on_onion_only {
84
+    app_name="$1"
85
+
86
+    read_config_param ONION_ONLY
87
+
88
+    if [[ "$ONION_ONLY" != 'no' ]]; then
89
+        if ! grep -q "NOT_ON_ONION=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
90
+            echo "0"
91
+            return
92
+        fi
93
+    fi
94
+    echo "1"
95
+}
96
+
83
 function app_expected_to_be_installed {
97
 function app_expected_to_be_installed {
84
     # is the given application expected to be installed by default?
98
     # is the given application expected to be installed by default?
85
     select_all_apps="$1"
99
     select_all_apps="$1"
108
     # shellcheck disable=SC2068
122
     # shellcheck disable=SC2068
109
     for a in ${APPS_AVAILABLE[@]}
123
     for a in ${APPS_AVAILABLE[@]}
110
     do
124
     do
111
-        if [[ ${APPS_INSTALLED[$app_index]} == "0" &&  "$select_all_apps" != "add-all" ]]; then
112
-            applist="$applist $n $a off"
113
-        else
114
-            if [[ $(app_expected_to_be_installed "$select_all_apps" "$a") == "0" ]]; then
125
+        if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
126
+            if [[ ${APPS_INSTALLED[$app_index]} == "0" &&  "$select_all_apps" != "add-all" ]]; then
115
                 applist="$applist $n $a off"
127
                 applist="$applist $n $a off"
116
             else
128
             else
117
-                applist="$applist $n $a on"
129
+                if [[ $(app_expected_to_be_installed "$select_all_apps" "$a") == "0" ]]; then
130
+                    applist="$applist $n $a off"
131
+                else
132
+                    applist="$applist $n $a on"
133
+                fi
118
             fi
134
             fi
135
+            n=$((n+1))
119
         fi
136
         fi
120
-        n=$((n+1))
121
         app_index=$((app_index+1))
137
         app_index=$((app_index+1))
122
     done
138
     done
123
 
139
 

+ 1
- 0
src/freedombone-app-gnusocial Прегледај датотеку

30
 
30
 
31
 IN_DEFAULT_INSTALL=0
31
 IN_DEFAULT_INSTALL=0
32
 SHOW_ON_ABOUT=1
32
 SHOW_ON_ABOUT=1
33
+NOT_ON_ONION=1
33
 
34
 
34
 GNUSOCIAL_DOMAIN_NAME=
35
 GNUSOCIAL_DOMAIN_NAME=
35
 GNUSOCIAL_CODE=
36
 GNUSOCIAL_CODE=

+ 1
- 0
src/freedombone-app-hubzilla Прегледај датотеку

30
 
30
 
31
 IN_DEFAULT_INSTALL=0
31
 IN_DEFAULT_INSTALL=0
32
 SHOW_ON_ABOUT=1
32
 SHOW_ON_ABOUT=1
33
+NOT_ON_ONION=1
33
 
34
 
34
 HUBZILLA_DOMAIN_NAME=
35
 HUBZILLA_DOMAIN_NAME=
35
 HUBZILLA_CODE=
36
 HUBZILLA_CODE=

+ 1
- 0
src/freedombone-app-jitsi Прегледај датотеку

32
 
32
 
33
 IN_DEFAULT_INSTALL=0
33
 IN_DEFAULT_INSTALL=0
34
 SHOW_ON_ABOUT=0
34
 SHOW_ON_ABOUT=0
35
+NOT_ON_ONION=1
35
 
36
 
36
 VIDEOBRIDGE_PORT=5347
37
 VIDEOBRIDGE_PORT=5347
37
 JITSI_ONION_PORT=8102
38
 JITSI_ONION_PORT=8102

+ 1
- 0
src/freedombone-app-matrix Прегледај датотеку

36
 
36
 
37
 IN_DEFAULT_INSTALL=0
37
 IN_DEFAULT_INSTALL=0
38
 SHOW_ON_ABOUT=1
38
 SHOW_ON_ABOUT=1
39
+NOT_ON_ONION=1
39
 
40
 
40
 MATRIX_DOMAIN_NAME=
41
 MATRIX_DOMAIN_NAME=
41
 MATRIX_CODE=
42
 MATRIX_CODE=

+ 1
- 0
src/freedombone-app-postactiv Прегледај датотеку

30
 
30
 
31
 IN_DEFAULT_INSTALL=0
31
 IN_DEFAULT_INSTALL=0
32
 SHOW_ON_ABOUT=1
32
 SHOW_ON_ABOUT=1
33
+NOT_ON_ONION=1
33
 
34
 
34
 POSTACTIV_DOMAIN_NAME=
35
 POSTACTIV_DOMAIN_NAME=
35
 POSTACTIV_CODE=
36
 POSTACTIV_CODE=

+ 1
- 0
src/freedombone-app-riot Прегледај датотеку

30
 
30
 
31
 IN_DEFAULT_INSTALL=0
31
 IN_DEFAULT_INSTALL=0
32
 SHOW_ON_ABOUT=1
32
 SHOW_ON_ABOUT=1
33
+NOT_ON_ONION=1
33
 
34
 
34
 RIOT_VERSION='0.13.3'
35
 RIOT_VERSION='0.13.3'
35
 RIOT_FILENAME="riot-v${RIOT_VERSION}"
36
 RIOT_FILENAME="riot-v${RIOT_VERSION}"