update

app-check

@@ -250,28 +250,21 @@ fi
 #		CHRIP
 #----------------------------------------------------#
 echo "Checking Chirp"
+#as of 02FEB23 running "chirp --version" no longer gives the version number
+#but instead starts chirp. Mods were made below to simply check if chirp
+#is installed or not
 if ! hash chirp 2>/dev/null; then
 	echo "CHIRP=Not_Installed" >> $UPDATEFILE
 else
+	echo "Installed" >> $UPDATEFILE
+
+fi
+
+
 	#bash function this could be moved to the top of the file and used globally
 	#to short hand lookups on GIT release pages
-	lastrelease() { git ls-remote --tags "$1" | cut -d/ -f3- | tail -n1; }
+	#lastrelease() { git ls-remote --tags "$1" | cut -d/ -f3- | tail -n1; }
 
-	CP=$(chirp --version)
-	CHIRP=$(echo ${CP} | awk '{ print $2 }' | sed 's/daily-//')
-	NEWCHIRP=$(curl -s https://github.com/goldstar611/chirp-appimage/releases | grep Release- | head -1 | sed 's/.*Release-//;s/">//')
-
-	CP=$(chirp --version)
-	CHIRP=$(echo ${CP} | awk '{ print $2 }' | sed 's/daily-//')
-	#function above called here as shorthand
-	NEWCHIRP=$(lastrelease https://github.com/goldstar611/chirp-appimage)
-
-	if (($(echo "${NEWCHIRP} ${CHIRP}" | awk '{print ($1 > $2)}'))); then
-			echo "CHIRP=NEEDS-UPDATE" >> $UPDATEFILE
-	else
-			echo "CHIRP=is_latest_version" >> $UPDATEFILE   
-	fi
-fi
 #----------------------------------------------------#
 #		DIREWOLF
 #----------------------------------------------------#

changelog

@@ -1,5 +1,10 @@
-version=3.3.1
+version=3.3.2
 
+3.3.2		Fix WSJTX not installing - Thanks Michael Shriver!
+		Fix Chirp not installing
+		Chirp update check changed. See notes in app-check script.
+		Fix VARA check where Pi user was hard coded
+		Fix https://github.com/km4ack/pi-build/issues/477
 3.3.1		Fix Chirp not installing on 64bit OS - https://github.com/km4ack/pi-build/pull/452
 		Fix Chirp version check
 		Fix QSSTV Install - https://github.com/km4ack/pi-build/issues/422

functions/additional.function

@@ -51,7 +51,7 @@ PAT() {
 	sudo systemctl start pat@${WHO}
 	sudo systemctl enable pat@${WHO}
 	cd ${DIR}
-	PAT_VERSION=$(pat version | awk '{print $2}' | sed 's/v0.//;s/.0//')
+	PAT_VERSION=$(pat version | awk '{print $2}' | awk -F "." '{print $2}')
 	#The Pat Winlink config file will change location in version 0.12. The below if statement
 	#checks to see which version is installed.
 	#check to see if pat version is 12 or greater. Change config file location
@@ -247,10 +247,11 @@ WSJTX() {
 
 	sudo apt install -y build-essential git cmake gfortran fftw3-dev qtbase5-dev qttools5-dev libqt5serialport5-dev  qtmultimedia5-dev libqt5multimedia5-plugins libqt5sql5-sqlite autoconf automake libtool texinfo libusb-1.0-0-dev libudev-dev libboost-all-dev asciidoctor
 
-	FT8PKG=$(curl -s https://physics.princeton.edu/pulsar/k1jt/wsjtx.html | grep .tgz | sed 's/.*="//;s/">.*$//' | head -1)
+	#credit to Michael Shriver for this fix
+	FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep .tgz | sed 's|.*">\(.*\.tgz\)</.*|\1|' | head -1)
 	FT8DIR=$(echo $FT8PKG | sed 's/.tgz//')
 	cd ${BUILDDIR}
-	wget --tries 2 --connect-timeout=60 https://physics.princeton.edu/pulsar/k1jt/$FT8PKG
+	wget --tries 2 --connect-timeout=60 https://sourceforge.net/projects/wsjt/files/$FT8PKG
 	tar -xvf $FT8PKG
 	rm $FT8PKG
 	cd $FT8DIR
@@ -415,6 +416,7 @@ sudo make install
 CHIRP() {
 
 	#sudo apt install -y chirp
+	#sample link - https://github.com/goldstar611/chirp-appimage/releases/download/20230202/Chirp-next-20230202-armhf.AppImage
 
 	cd ${DIR} || return
 	sudo apt install libfuse2
@@ -423,16 +425,16 @@ CHIRP() {
 	#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"
+	LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-next-$CHIRPDATE-armhf.AppImage"
 
 	else
 
-	LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-aarch64.AppImage"
+	LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-next-$CHIRPDATE-aarch64.AppImage"
 
 	fi
 
 	wget $LINK
-	CHIRP=$(ls | grep Chirp-daily)
+	CHIRP=$(ls | grep Chirp-next)
 	sudo mv $CHIRP /usr/local/bin/chirp
 	sudo chmod +x /usr/local/bin/chirp