Merge branch 'master'

Conflicts:
	config/config.template.ini
	install.sh
This commit is contained in:
Bastian Schroll 2016-10-02 11:48:28 +02:00
commit 50303b79fc
2 changed files with 21 additions and 21 deletions

View file

@ -29,7 +29,7 @@ backupCount = 7
# so don't use it for one rapid Plugin
processAlarmAsync = 0
# Using RegEx-Filter (0|1)
# Using RegEx-Filter (0 - off | 1 - on)
# Filter-configuration in section [Filters]
useRegExFilter = 0
@ -41,7 +41,7 @@ doubleFilter_ignore_entries = 10
# time to ignore same alarm (only ID is checked) (sek)
doubleFilter_ignore_time = 5
# ignore msg is only usefull for POCSAG (0|1)
# ignore msg is only usefull for POCSAG (0 - off | 1 - on)
# 0: double check ignores the msg-text (only check ID + function)
# 1: if you want to differentiate between with/ without msg
# f.e. if they use quick-alarm (without text, then same ric with msg)
@ -69,13 +69,13 @@ appName = BOSWatch
[FMS]
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/fms.csv
idDescribed = 0
[ZVEI]
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/zvei.csv
idDescribed = 0
@ -94,7 +94,7 @@ filter_range_start = 0000000
filter_range_end = 9999999
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/poc.csv
idDescribed = 0
@ -118,7 +118,7 @@ idDescribed = 0
[Plugins]
# can take on or off the plugins (0|1)
# turn the plugins on or off (0 - off | 1 - on)
MySQL = 0
httpRequest = 0
eMail = 0

View file

@ -11,27 +11,27 @@ echo " by Bastian Schroll "
echo ""
echo "This may take a several minutes... Don't panic!"
echo ""
echo "Caution, script don't install a Webserver with PHP and MySQL"
echo "So you have to make up manually if you want to use MySQL support"
echo "Caution, script doesn't install a Webserver with PHP and MySQL"
echo "so you have to install it later manually if you want to use the MySQL features"
mkdir -p ~/boswatch/install
tput cup 13 15
echo "[ 1/10] [#---------]"
tput cup 15 5
echo "-> make a apt-get update................"
echo "-> refreshing package versions............."
apt-get update -y > ~/boswatch/install/setup_log.txt 2>&1
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 >> ~/boswatch/install/setup_log.txt 2>&1
echo "-> downloading GIT an other stuff.........."
apt-get -y install git cmake build-essential libusb-1.0 qt4-qmake libpulse-dev libx11-dev sox >> ~/boswatch/install/setup_log.txt 2>&1
tput cup 13 15
echo "[ 3/10] [###-------]"
tput cup 15 5
echo "-> download rtl_fm......................"
echo "-> downloading rtl_fm......................"
cd ~/boswatch/install
git clone git://git.osmocom.org/rtl-sdr.git >> ~/boswatch/install/setup_log.txt 2>&1
cd rtl-sdr/
@ -39,7 +39,7 @@ cd rtl-sdr/
tput cup 13 15
echo "[ 4/10] [####------]"
tput cup 15 5
echo "-> compile rtl_fm......................"
echo "-> compiling rtl_fm........................"
mkdir -p build && cd build
cmake ../ -DINSTALL_UDEV_RULES=ON >> ~/boswatch/install/setup_log.txt 2>&1
make >> ~/boswatch/install/setup_log.txt 2>&1
@ -49,7 +49,7 @@ ldconfig >> ~/boswatch/install/setup_log.txt 2>&1
tput cup 13 15
echo "[ 5/10] [#####-----]"
tput cup 15 5
echo "-> download multimon-ng................"
echo "-> downloading multimon-ng................"
cd ~/boswatch/install
git clone https://github.com/EliasOenal/multimonNG.git >> ~/boswatch/install/setup_log.txt 2>&1
cd multimonNG/
@ -57,7 +57,7 @@ cd multimonNG/
tput cup 13 15
echo "[ 6/10] [######----]"
tput cup 15 5
echo "-> compile multimon-ng................."
echo "-> compiling multimon-ng................."
mkdir -p build
cd build
qmake ../multimon-ng.pro >> ~/boswatch/install/setup_log.txt 2>&1
@ -67,7 +67,7 @@ make install >> ~/boswatch/install/setup_log.txt 2>&1
tput cup 13 15
echo "[ 7/10] [#######---]"
tput cup 15 5
echo "-> download MySQL Connector for Python."
echo "-> downloading the MySQL Connector for Python."
cd ~/boswatch/install
wget "http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-1.0.9.tar.gz/from/http://cdn.mysql.com/" -O mysql-connector.tar >> ~/boswatch/install/setup_log.txt 2>&1
tar xfv mysql-connector.tar >> ~/boswatch/install/setup_log.txt 2>&1
@ -76,25 +76,25 @@ cd mysql-connector-python*
tput cup 13 15
echo "[ 8/10] [########--]"
tput cup 15 5
echo "-> install MySQL Connector for Python.."
echo "-> installing the MySQL Connector for Python.."
chmod +x ./setup.py
./setup.py install >> ~/boswatch/install/setup_log.txt 2>&1
tput cup 13 15
echo "[ 9/10] [#########-]"
tput cup 15 5
echo "-> download BOSWatch..................."
echo "-> downloading BOSWatch from GitHub.........."
cd ~/boswatch
git clone https://github.com/Schrolli91/BOSWatch >> ~/boswatch/install/setup_log.txt 2>&1
tput cup 13 15
echo "[10/10] [##########]"
tput cup 15 5
echo "-> configure..........................."
echo "-> Configuring BOSWatch........................"
cd ~/boswatch
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
tput cup 17 1
echo "BOSWatch are now installed in ~/boswatch/"
echo "Install ready!"
echo "BOSWatch is now installed in ~/boswatch/"
echo "Installation finished!"