From 4b6352167f9ff09e6527a270a103363fbcaa1a0a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 1 Nov 2016 17:29:56 +0000 Subject: [PATCH] Don't include SIP in the default installation --- src/freedombone-app-sip | 6 +++--- src/freedombone-controlpanel | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip index a85b2886..64092756 100755 --- a/src/freedombone-app-sip +++ b/src/freedombone-app-sip @@ -28,10 +28,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -VARIANTS='full full-vim chat' +VARIANTS='' -IN_DEFAULT_INSTALL=1 -SHOW_ON_ABOUT=1 +IN_DEFAULT_INSTALL=0 +SHOW_ON_ABOUT=0 SIP_SERVER_PASSWORD= SIP_PORT=5060 diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 5cd07f1f..4187d302 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -307,10 +307,12 @@ function show_users { echo '=====' echo '' echo -n -e "$(pad_string 'Name')" - echo -n -e "$(pad_string 'SIP ext')" + if [[ $(app_is_installed sip) == "1" ]]; then + echo -n -e "$(pad_string 'SIP ext')" + fi echo -n -e "$(pad_string 'Data')" echo '' - echo '--------------------------------------------------------------------------' + echo '----------------------------------' for d in /home/*/ ; do USRNAME=$(echo "$d" | awk -F '/' '{print $3}') if [[ $(is_valid_user "$USRNAME") == "1" ]]; then