Merge pull request #411 from km4ack/beta

Beta

build-a-pi

@@ -144,15 +144,16 @@ fi
 #####################################
 #	Check user is pi
 #####################################
-if [ "$WHO" != 'pi' ]; then
-	yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \
-		--image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \
-		--text="<b>USER NAME IS NOT PI</b>\rThis script is designed to be run as the pi user. Please set the user name to pi \
-and try again. You can change the user name after the build is complete but some configuration may not work \
-as expected" \
-		--button=gtk-close
-	exit 1
-fi
+#This section commented out 12APRIL2022 for testing. Should be removed once testing is complete.
+#if [ "$WHO" != 'pi' ]; then
+#	yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \
+#		--image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \
+#		--text="<b>USER NAME IS NOT PI</b>\rThis script is designed to be run as the pi user. Please set the user name to pi \
+#and try again. You can change the user name after the build is complete but some configuration may not work \
+#as expected" \
+#		--button=gtk-close
+#	exit 1
+#fi
 #####################################
 #	notice to user
 #####################################
@@ -393,6 +394,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
 	false "WSJTX" "Weak Signal Digital Mode Software" \
 	false "PYQSO" "Logging Software" \
 	false "HAMRS" "Logging Software" \
+	false "CQRLOG" "Logging Software" \
 	false "EES" "KM4ACK Emergency Email Server" \
 	false "QSSTV" "Slow Scan TV" \
 	false "GRIDTRACKER" "Track Grids in WSJTX" \
@@ -414,7 +416,7 @@ fi
 if [ ${BUT} = 3 ]; then
 	ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
 		HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL
-		GRIDCALC)
+		GRIDCALC CQRLOG)
 
 	for i in "${ADDAPPS[@]}"; do
 		echo "$i" >>${ADDITIONAL}

changelog

@@ -1,4 +1,15 @@
-version=3.2.3
+version=3.2.4
+
+3.2.4		Update HotSpot Tools shortcut
+		Change 1000 to UID in update script
+		Remove Pi username check
+		add ability to work with custom user names
+		fix shortcut for Pi-APRS
+		fix issue #391 https://github.com/km4ack/pi-build/issues/391
+		fix issue #390 https://github.com/km4ack/pi-build/issues/390
+		fix issue #380 https://github.com/km4ack/pi-build/issues/380
+		fix issue #401 Gridtracker not downloading https://github.com/km4ack/pi-build/issues/401
+		fix hamrs not installing/updating - https://github.com/km4ack/pi-build/issues/404
 
 3.2.3		Add support for Pat Winlink in 64 bit OS
 		Fix FLDIGI on 64 bit - https://github.com/km4ack/pi-build/issues/378

functions/additional.function

@@ -235,7 +235,7 @@ WSJTX() {
 	FT8PKG=$(curl -s https://physics.princeton.edu/pulsar/k1jt/wsjtx.html | grep .tgz | sed 's/.*="//;s/">.*$//' | head -1)
 	FT8DIR=$(echo $FT8PKG | sed 's/.tgz//')
 	cd ${BUILDDIR}
-	wget https://physics.princeton.edu/pulsar/k1jt/$FT8PKG
+	wget --tries 2 --connect-timeout=60 https://physics.princeton.edu/pulsar/k1jt/$FT8PKG
 	tar -xvf $FT8PKG
 	rm $FT8PKG
 	cd $FT8DIR
@@ -301,7 +301,7 @@ CONKY() {
 	sed -i "s/N0CALL/${CALL}/" ${HOME}/.conkyrc
 	#Line below is for https://github.com/km4ack/pi-build/issues/198
 	echo "#Update GPS maidenhead for conky" >>${TEMPCRON}
-	echo "*/1 * * * * /home/pi/bin/conky/grid" >>${TEMPCRON}
+	echo "*/1 * * * * /home/`whoami`/bin/conky/grid" >>${TEMPCRON}
 
 	#Create files needed for autostart at login
 	#Fix issue https://github.com/km4ack/pi-build/issues/83
@@ -312,7 +312,7 @@ Name=Conky
 Comment=Conky
 GenericName=Conky Screen Background Monitor
 Exec=conky --pause=5
-Icon=/home/pi/pi-build/conky/conky-logo.png
+Icon=/home/`whoami`/pi-build/conky/conky-logo.png
 Type=Application
 Encoding=UTF-8
 Terminal=false
@@ -330,8 +330,8 @@ EOF
 Name=Conky-Prefs
 Comment=Conky-Prefs
 GenericName=Change Conky Preferences
-Exec=/home/pi/pi-build/conky/setconky
-Icon=/home/pi/pi-build/conky/conky-logo.png
+Exec=/home/`whoami`/pi-build/conky/setconky
+Icon=/home/`whoami`/pi-build/conky/conky-logo.png
 Type=Application
 Encoding=UTF-8
 Terminal=false
@@ -481,11 +481,17 @@ GRIDTRACKER() {
 	sudo apt-get install -y libgconf-2-4
 	#determine if 32/64 bit and set download link accordingly. issue #382
 	if [ `getconf LONG_BIT` = '32' ]; then
-	GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm32 | sed 's/.*href="//;s/">.*//')
+	#GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm32 | sed 's/.*href="//;s/">.*//')
+	GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS="<Key>"; OFS="\n<Key>"} {$1=$1} 1' | grep arm32 | sed '/<Key>nwjs/d;/<Key>test/d' | head -1 | sed 's/<Key>//;s/<\/Key>.*//')	
+	GT_DIR=$(echo $GRIDDLL | sed 's|/.*||')
+	GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
 	else
-	GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm64 | sed 's/.*href="//;s/">.*//')
+	#GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm64 | sed 's/.*href="//;s/">.*//')
+	GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS="<Key>"; OFS="\n<Key>"} {$1=$1} 1' | grep arm32 | sed '/<Key>nwjs/d;/<Key>test/d' | head -1 | sed 's/<Key>//;s/<\/Key>.*//')
+	GT_DIR=$(echo $GRIDDLL | sed 's|/.*||')
+	GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
 	fi
-	wget --tries 2 --connect-timeout=60 $GRIDDLL
+	wget --tries 2 --connect-timeout=60 https://storage.googleapis.com/gt_download/$GT_DIR/$GRIDDLL
 	GRIDTAR=$(echo $GRIDDLL | sed 's/.*\///g')
 	tar -xzvf $GRIDTAR
 	rm GridTracker*.gz
@@ -511,6 +517,8 @@ Categories=HamRadio;
 EOF
 
 	sudo mv gridtracker.desktop /usr/share/applications/
+
+
 }
 
 ##################################
@@ -683,7 +691,18 @@ EES() {
 PI-APRS() {
 	cd ${HOME} || return
 	git clone https://github.com/km4ack/Pi-APRS.git
-	sudo cp ~/Pi-APRS/piaprs.desktop /usr/share/applications
+cat <<EOF > /run/user/$UID/piaprs.desktop
+[Desktop Entry]
+Name=Pi-APRS
+GenericName=Pi-ARPS by KM4ACK
+Comment=Pi-APRS by KM4ACK
+Exec=/home/`whoami`/Pi-APRS/pi-aprs
+Icon=/home/`whoami`/Pi-APRS/ISS.png
+Terminal=true
+Type=Application
+Categories=HamRadio;
+EOF
+	sudo cp /run/user/$UID/piaprs.desktop /usr/share/applications/
 
 }
 
@@ -823,7 +842,7 @@ mv $HOME/Downloads/hamrs* $HOME/Downloads/old-hamrs
 fi
 
 cd ${HOME}/Downloads
-DL=$(curl https://www.hamrs.app | grep armv7 | sed 's/^.*href="//;s/">//')
+DL=$(curl https://www.hamrs.app | grep armv7 | sed 's/.*href="//;s/".*//')
 wget ${DL}
 HAMRS=$(ls | grep hamrs-)
 mv ${HAMRS} hamrs

functions/base.function

@@ -49,7 +49,20 @@ HSTOOLS() {
         rm -rf ${HOME}/hotspot-tools2
     fi
     git clone https://github.com/km4ack/hotspot-tools2.git ${HOME}/hotspot-tools2
-    sudo cp ${HOME}/hotspot-tools2/hstools.desktop /usr/share/applications/hotspot-tools.desktop
+    
+cat <<EOF > /run/user/$UID/hotspot-tools.desktop
+[Desktop Entry]
+Name=Hotspot Tools
+GenericName=Tools to Manage AutoHotSpot
+Comment=Tools to Manage AutoHotSpot
+Exec=/home/`whoami`/hotspot-tools2/hstools
+Icon=/home/`whoami`/hotspot-tools2/logo.png
+Terminal=false
+Type=Application
+Categories=HamRadio;
+EOF
+
+    sudo cp /run/user/$UID/hotspot-tools.desktop /usr/share/applications/hotspot-tools.desktop
 }
 
 ################################
@@ -204,7 +217,7 @@ DIREWOLF() {
     sudo make clean
     sed -i "s/N0CALL/${CALL}/" "${HOME}/direwolf.conf"
     sed -i 's/# ADEVICE  plughw:1,0/ADEVICE  plughw:3,0/' ${HOME}/direwolf.conf
-    sed -i '/#PTT\ \/dev\/ttyUSB0\ RTS/a #Uncomment line below for PTT with sabrent sound card\n#PTT RIG 2 localhost:4532' ${HOME}/direwolf.conf
+    sed -i '/#PTT\ \/dev\/ttyUSB0\ RTS/a #Uncomment line below for PTT with CAT through FLRIG\n#PTT RIG 2 localhost:4532' ${HOME}/direwolf.conf
 
 }
 

menu-update

@@ -74,7 +74,7 @@ if [ ! -f /usr/local/share/applications/donate.desktop ]; then
 Name=Donate
 Comment=Donate to Build a Pi
 Exec=xdg-open https://www.paypal.com/paypalme/km4ack
-Icon=/home/pi/pi-build/logo.png
+Icon=/home/`whoami`/pi-build/logo.png
 Terminal=false
 Type=Application
 Categories=bap
@@ -91,7 +91,7 @@ if [ ! -f /usr/local/share/applications/faq.desktop ]; then
 Name=FAQ
 Comment=Build a Pi FAQ
 Exec=xdg-open https://app.simplenote.com/publish/C3bBxN
-Icon=/home/pi/pi-build/logo.png
+Icon=/home/`whoami`/pi-build/logo.png
 Terminal=false
 Type=Application
 Categories=bap
@@ -109,7 +109,7 @@ if [ ! -f /usr/local/share/applications/support.desktop ]; then
 Name=Tech Support
 Comment=Build a Pi Tech Support
 Exec=xdg-open https://groups.io/g/KM4ACK-Pi/topics
-Icon=/home/pi/pi-build/logo.png
+Icon=/home/`whoami`/pi-build/logo.png
 Terminal=false
 Type=Application
 Categories=bap
@@ -156,7 +156,7 @@ cat >bap.directory <<EOF
 Type=Directory
 Encoding=UTF-8
 Name=Build-a-Pi
-Icon=/home/pi/pi-build/logo.png
+Icon=/home/`whoami`/pi-build/logo.png
 EOF
 
 sudo mv bap.directory /usr/share/desktop-directories/

update

@@ -23,7 +23,7 @@ LOGO=${MYPATH}/logo.png
 TEMPCRON=${MYPATH}/cron.tmp
 VERSION=$(grep "version=" ${MYPATH}/changelog | sed 's/version=//')
 DATE=$(date)
-UPDATEFILE=/run/user/1000/bapupdate.txt
+UPDATEFILE=/run/user/$UID/bapupdate.txt
 
 FINISH() {
 	if [ -f "${BASE}" ]; then
@@ -455,6 +455,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
 	false "PI-APRS" "$PIAPRS" "APRS Messaging Client" \
 	false "PYQSO" "$PYQSO" "Logging Software" \
 	false "HAMRS" "$HAMRS" "Logging Software" \
+	false "CQRLOG" "$CQRLOG" "Logging Software" \
 	false "QSSTV" "$QSSTV" "Slow scan TV" \
 	false "GRIDTRACKER" "$GRIDTRACK" "Track grids in WSJTX" \
 	false "HAMCLOCK" "$HAMCLOCK" "Clock for Ham Radio Ops" \