Merge branch 'master' of github.com:filipsPL/autowx2

install.sh

@@ -31,10 +31,10 @@ echo
 sudo apt-get update
 sudo apt-get install -y rtl-sdr git libpulse-dev qt4-qmake fftw3 libc6 libfontconfig1 libx11-6 libxext6 libxft2 libusb-1.0-0-dev \
 libavahi-client-dev libavahi-common-dev libdbus-1-dev libfftw3-single3 libpulse-mainloop-glib0 librtlsdr0 librtlsdr-dev \
-libfftw3-dev  libfftw3-double3 lame sox libsox-fmt-mp3 libtool automake python-pil python-imaging imagemagick
+libfftw3-dev libfftw3-double3 lame sox libsox-fmt-mp3 libtool automake python-pil python-imaging imagemagick python-dev
 
 
-if [ ${MACHINE_TYPE} == 'armv6l' ]; then
+if [ ${MACHINE_TYPE} == 'armv6l' ] || [ ${MACHINE_TYPE} == 'armv7l' ]; then
 	echo
 	echo
 	echo "******** Installing Rpi required packages"
@@ -50,7 +50,7 @@ fi
 
 
 PIP_OPTIONS=""
-if [ ${MACHINE_TYPE} == 'armv6l' ]; then
+if [ ${MACHINE_TYPE} == 'armv6l' ] || [ ${MACHINE_TYPE} == 'armv7l' ]; then
   PIP_OPTIONS="--no-cache-dir"
 fi
 
@@ -76,7 +76,7 @@ if [ ${MACHINE_TYPE} == 'x86_64' ]; then
     echo "64-bit system"
     wget https://wxtoimgrestored.xyz/downloads/wxtoimg-linux64-2.10.11-1.tar.gz
     gunzip < wxtoimg-linux64-2.10.11-1.tar.gz | sudo sh -c "(cd /; tar -xvf -)"
-elif [ ${MACHINE_TYPE} == 'armv6l' ]; then
+elif [ ${MACHINE_TYPE} == 'armv6l' ] || [ ${MACHINE_TYPE} == 'armv7l' ]; then
     wget https://wxtoimgrestored.xyz/beta/wxtoimg-armhf-2.11.2-beta.deb
     sudo dpkg -i wxtoimg-armhf-2.11.2-beta.deb
 else