Explorar el Código

Don't include SIP in the default installation

Bob Mottram hace 8 años
padre
commit
4b6352167f
Se han modificado 2 ficheros con 7 adiciones y 5 borrados
  1. 3
    3
      src/freedombone-app-sip
  2. 4
    2
      src/freedombone-controlpanel

+ 3
- 3
src/freedombone-app-sip Ver fichero

@@ -28,10 +28,10 @@
28 28
 # You should have received a copy of the GNU Affero General Public License
29 29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30 30
 
31
-VARIANTS='full full-vim chat'
31
+VARIANTS=''
32 32
 
33
-IN_DEFAULT_INSTALL=1
34
-SHOW_ON_ABOUT=1
33
+IN_DEFAULT_INSTALL=0
34
+SHOW_ON_ABOUT=0
35 35
 
36 36
 SIP_SERVER_PASSWORD=
37 37
 SIP_PORT=5060

+ 4
- 2
src/freedombone-controlpanel Ver fichero

@@ -307,10 +307,12 @@ function show_users {
307 307
     echo '====='
308 308
     echo ''
309 309
     echo -n -e "$(pad_string 'Name')"
310
-    echo -n -e "$(pad_string 'SIP ext')"
310
+    if [[ $(app_is_installed sip) == "1" ]]; then
311
+        echo -n -e "$(pad_string 'SIP ext')"
312
+    fi
311 313
     echo -n -e "$(pad_string 'Data')"
312 314
     echo ''
313
-    echo '--------------------------------------------------------------------------'
315
+    echo '----------------------------------'
314 316
     for d in /home/*/ ; do
315 317
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
316 318
         if [[ $(is_valid_user "$USRNAME") == "1" ]]; then