diff --git a/README.md b/README.md index 342ffc9..2c7211c 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,9 @@ Software TNC. In this setup, Direwolf is used for a 2M packet connection with Pa #### AX25: AX.25 tools for Direwolf & Pat. Recommended if installing Pat. +#### gARIM/vARIM: +ARIM means "Amateur Radio Instant Messaging" https://www.whitemesa.net/garim/garim.html and https://www.whitemesa.net/varim/varim.html using ARDROP or VARA modem + #### HAMLIB: Rig contol software. https://sourceforge.net/projects/hamlib/ diff --git a/app-check b/app-check index 7c03a53..3179704 100644 --- a/app-check +++ b/app-check @@ -341,6 +341,23 @@ CHECK() { fi fi + #----------------------------------------------------# + # VARIM + #----------------------------------------------------# + echo "Checking VARIM" + if ! hash varim 2>/dev/null; then + echo "VARIM=Not_Installed" >> $UPDATEFILE + else + VARIM=$(varim --version | head -n1 | awk -F ' ' '{print $2}') + NEWVARIM=$(curl -s https://www.whitemesa.net/varim/varim.html | grep -m 1 \ + "armv7l.tar.gz" | awk -F '-' '{print $2}') + if (($(echo "${NEWVARIM} ${VARIM}" | awk '{print ($1 > $2)}'))); then + echo "VARIM=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "VARIM=is_latest_version" >> $UPDATEFILE + fi + fi + #----------------------------------------------------# # XASTIR #----------------------------------------------------# @@ -727,10 +744,12 @@ REPEAT_CURRENT_VER=$(dpkg --list | grep repeater-start | awk '{print $3}') REPEAT_LATEST=$(curl -s https://sourceforge.net/projects/repeater-start/files/ | grep all.deb | head -1 | sed 's/.*repeater/repeater/;s/".*//') REPEAT_LATEST_VER=$(echo $REPEAT_LATEST | sed 's/repeater-start_//;s/_.*//') - if (($(echo "${REPEAT_LATEST_VER} ${REPEAT_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then + if [ -z "$REPEAT_CURRENT_VER" ]; then + echo "REPEAT=Not_Installed" >> $UPDATEFILE + elif (($(echo "${REPEAT_LATEST_VER} ${REPEAT_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then echo "REPEAT=NEEDS-UPDATE" >> $UPDATEFILE else echo "REPEAT=is_latest_version" >> $UPDATEFILE fi -CHECK \ No newline at end of file +CHECK diff --git a/build-a-pi b/build-a-pi old mode 100755 new mode 100644 index 7853ee8..c82b663 --- a/build-a-pi +++ b/build-a-pi @@ -434,7 +434,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO + ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL GRIDCALC CQRLOG REPEAT) diff --git a/changelog b/changelog index 5017f02..c69b1b4 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ -version=3.3.0 +version=3.3.1 +3.3.1 Fix Chirp not installing on 64bit OS - https://github.com/km4ack/pi-build/pull/452 + Fix QSSTV Install - https://github.com/km4ack/pi-build/issues/422 + Fix Repeat Start App Check - https://github.com/km4ack/pi-build/issues/450 3.3.0 Add VARA modem - https://github.com/km4ack/pi-build/issues/394 fix conky 7 inch config - https://github.com/km4ack/pi-build/issues/414 fix old ardop modem not removed - https://github.com/km4ack/pi-build/issues/413 diff --git a/functions/additional.function b/functions/additional.function index 6aa5f4e..ca23d46 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -415,10 +415,22 @@ sudo make install CHIRP() { #sudo apt install -y chirp + cd ${DIR} || return sudo apt install libfuse2 CHIRPDATE=$(curl -s https://github.com/goldstar611/chirp-appimage | grep "releases/tag/" | sed 's|.*releases/tag/||;s|">||') + + #determine if 32/64 bit and set download link accordingly. issue #382 + if [ `getconf LONG_BIT` = '32' ]; then + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" + + else + + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-aarch64.AppImage" + + fi + wget $LINK CHIRP=$(ls | grep Chirp-daily) sudo mv $CHIRP /usr/local/bin/chirp @@ -473,6 +485,27 @@ GARIM() { rm *.gz } + +################################ +# VARIM +################################## +VARIM() { + sudo apt-get install -y libfltk1.1-dev + sudo apt-get install -y libfltk1.3-dev + VPKG=$(curl -s https://www.whitemesa.net/varim/src/ | grep tar.gz | tail -1 | sed 's/^.*varim/varim/' | sed 's/tar.gz.*$/tar.gz/') + cd ${BUILDDIR} || return + wget --tries 2 --connect-timeout=60 https://www.whitemesa.net/varim/src/$VPKG + tar -xzvf $VPKG + DIRR=$(echo $VPKG | sed 's/.tar.gz//') + cd ${DIRR} || return + ./configure + make + sudo make install + sudo make clean + cd ${BUILDDIR} || return + rm *.gz +} + ################################## # QSSTV ################################## @@ -481,19 +514,17 @@ QSSTV() { cd ${BUILDDIR} || return - TAR=$(curl -s http://users.telenet.be/on4qz/qsstv/downloads/ | grep tar.gz | sed 's/.*href="//' | sed 's/">.*$//' | tail -1) - wget --tries 2 --connect-timeout=60 http://users.telenet.be/on4qz/qsstv/downloads/$TAR - tar -xvzf $TAR - SSTVTAR=$(ls -d */ | grep qss) - cd $SSTVTAR || return + git clone https://github.com/ON4QZ/QSSTV + cd QSSTV/src || return + qmake make sudo make install sudo make clean cd ${BUILDDIR} || return - rm *.gz - mkdir -p /usr/local/share/pixmaps/ - sudo cp ${BUILDDIR}/${SSTVTAR}/icons/qsstv.png /usr/local/share/pixmaps/ + + sudo mkdir -p /usr/local/share/pixmaps/ + sudo cp ${BUILDDIR}/QSSTV/src/icons/qsstv.png /usr/local/share/pixmaps/ cat >qsstv.desktop <