From df569b00f09a8be81f0219e886e73d4aa7653d77 Mon Sep 17 00:00:00 2001 From: flothi Date: Mon, 21 Nov 2016 14:26:55 +0100 Subject: [PATCH 1/2] Update install.sh Fixing errors found through testing version 2.1: - conflict between qt4- and qt5-default resolved - deleted qt5-default as it seems there is no need for it (l. 57) - fixing output-format for modprobe.d-file as no newline was created (l. 128) - fixed comparison to reboot (l. 134) Remember to call this file with "bash" instead of "sh" --- install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index f032a8d..8b6ff2e 100644 --- a/install.sh +++ b/install.sh @@ -54,7 +54,7 @@ tput cup 13 15 echo "[ 2/10] [##--------]" tput cup 15 5 echo "-> download GIT an other stuff.........." -apt-get -y install git cmake build-essential libusb-1.0 qt4-qmake qt4-default qt5-default libpulse-dev libx11-dev sox >> $boswatchpath/install/setup_log.txt 2>&1 +apt-get -y install git cmake build-essential libusb-1.0 qt4-qmake qt4-default libpulse-dev libx11-dev sox >> $boswatchpath/install/setup_log.txt 2>&1 tput cup 13 15 echo "[ 3/10] [###-------]" @@ -125,12 +125,12 @@ tput cup 15 5 echo "-> configure..........................." cd $boswatchpath/ chmod +x * -echo "# BOSWatch - blacklist the DVB drivers to avoid conflict with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core" >> /etc/modprobe.d/boswatch_blacklist_sdr.conf +echo $'# BOSWatch - blacklist the DVB drivers to avoid conflict with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core' >> /etc/modprobe.d/boswatch_blacklist_sdr.conf tput cup 17 1 echo "BOSWatch are now installed in $boswatchpath/" echo "Install ready!" -if [ $reboot == "true" ]; then +if [ $reboot = "true" ]; then /sbin/reboot fi From 8a82d049d430292c5b80db9ffe5a8015d1c7d6eb Mon Sep 17 00:00:00 2001 From: flothi Date: Mon, 21 Nov 2016 14:31:21 +0100 Subject: [PATCH 2/2] Update config.template.ini Added forgotten plugin switch for yowsup due to errors while BOSWatch misses it during startup --- config/config.template.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config.template.ini b/config/config.template.ini index 33a7de9..05c4c1f 100644 --- a/config/config.template.ini +++ b/config/config.template.ini @@ -136,6 +136,7 @@ Sms77 = 0 FFAgent = 0 Pushover = 0 Telegram = 0 +yowsup = 0 # for developing template-module template = 0