Merge pull request #23 from km4ack/dev

Dev
pull/445/head
Kelly 2022-10-20 07:11:40 -07:00 zatwierdzone przez GitHub
commit dd1b74e8b0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
8 zmienionych plików z 627 dodań i 542 usunięć

Wyświetl plik

@ -96,6 +96,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/

1039
app-check

Plik diff jest za duży Load Diff

Wyświetl plik

@ -262,7 +262,7 @@ fi
#If VARA is chosen, make sure we have a Pi 4 32 bit system to work with.
#As of 02OCT2022 the VARA installer only works with the Pi 4.
VARA_CHK=$(grep VARA ${BASE})
if [ -n $VARA_CHK ]; then
if [ -n "$VARA_CHK" ]; then
FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }')
if [ $FREEMEM -lt 1500 ]; then
echo "Not enough memory available"
@ -295,7 +295,7 @@ for the Hot Spot\r</b>NOTE: The last field is the password for the hotspot. You
connect to your Pi when it is in hotspot mode <b>This password can only contain letters and numbers</b>" \
--title="Build-a-Pi" \
--field="Home Wifi SSID":CB "$LIST" \
--field="Home Wifi Password" \
--field="Home Wifi Password":H \
--field="Hot Spot Password" \
--button="Exit":1 \
--button="Continue":2 \
@ -432,7 +432,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi
if [ ${BUT} = 3 ]; then
ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
ADDAPPS=(CONKY PI-APRS CHIRP GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL
GRIDCALC CQRLOG REPEAT)
@ -462,7 +462,7 @@ if [ -n "$PATCHECK" ]; then
--image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \
--text="<b>version $VERSION</b>" \
--field="Six Character Grid Square" \
--field="Winlink Password" \
--field="Winlink Password":H \
--field="<b>Password is case sensitive</b>":LBL \
--button="Continue":2)
GRID=$(echo ${INFO} | awk -F "|" '{print $1}')
@ -483,6 +483,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "PACKETSEARCH" "Winlink Packet Tool" \
false "CALLSIGN" "Call sign lookup" \
false "TEMPCONVERT" "Temperature Converter" \
false "HDOCS" "Reference Materials PDFs" \
false "GPARTED" "Disk Utility Tool" \
false "SHOWLOG" "Log file viewer" \
false "PISTATS" "Pi3/4 Stats Monitor" \
@ -504,7 +505,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi
if [ ${BUT} = 3 ]; then
UTILAPPS=(DIPOLE PACKETSEARCH CALLSIGN TEMPCONVERT GPARTED SHOWLOG PISTATS TELNET PITERM QTSOUND SECURITY YGATE BPQ BATT VNC XYGRIB)
UTILAPPS=(DIPOLE PACKETSEARCH CALLSIGN TEMPCONVERT HDOCS GPARTED SHOWLOG PISTATS TELNET PITERM QTSOUND SECURITY YGATE BPQ BATT VNC XYGRIB)
for i in "${UTILAPPS[@]}"; do
echo "$i" >>${UTILITY}
done

Wyświetl plik

@ -1,5 +1,15 @@
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 Chirp version check
Fix QSSTV Install - https://github.com/km4ack/pi-build/issues/422
Fix Repeat Start App Check - https://github.com/km4ack/pi-build/issues/450
Add VARIM - https://github.com/km4ack/pi-build/pull/458
Add reference docs - https://github.com/km4ack/pi-build/pull/446
Cleanup app-check script
Fix VARA showing "not installed" when it was installed
Hide Passwords while typing. - Thanks Nullvibes!
Fix FLRIG not in flsuite sub category - Thanks lcgreenwald!
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
@ -7,6 +17,7 @@ version=3.3.0
update chirp install - https://github.com/km4ack/pi-build/issues/337
use 64bit package to install pat on 64bit OS - https://github.com/km4ack/pi-build/issues/424
Add RepeaterStart - https://github.com/km4ack/pi-build/issues/400
fix gridtracker download - https://github.com/km4ack/pi-build/issues/447
3.2.4 Update HotSpot Tools shortcut
Change 1000 to UID in update script
Remove Pi username check

Wyświetl plik

@ -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 <<EOF
[Desktop Entry]
@ -510,27 +541,29 @@ EOF
sudo mv qsstv.desktop /usr/share/applications/
}
##################################
# GRIDTRACKER
##################################
GRIDTRACKER() {
#due to constant changes to GT website, get the download link from a file on KM4ACK github.
cd /run/user/$UID/
wget https://raw.githubusercontent.com/km4ack/pi-scripts/master/gt-download-links
cd ${HOME} || return
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://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/')
GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm32 | sed 's/arm32=//')
GT_TAR_NAME=$(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://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/')
GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm64 | sed 's/arm64=//')
GT_TAR_NAME=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
fi
wget --tries 2 --connect-timeout=60 https://storage.googleapis.com/gt_download/$GT_DIR/$GRIDDLL
GRIDTAR=$(echo $GRIDDLL | sed 's/.*\///g')
tar -xzvf $GRIDTAR
wget --tries 2 --connect-timeout=60 $GRIDDLL
tar -xzvf $GT_TAR_NAME
rm GridTracker*.gz
#determine if 32/64 bit and get correct directory name.
if [ `getconf LONG_BIT` = '32' ]; then
@ -539,6 +572,8 @@ GRIDTRACKER() {
OLDFOLDER=$(ls | grep GridTracker*-linux-arm64)
fi
mv "$OLDFOLDER" $HOME/GridTracker
cat >gridtracker.desktop <<EOF
[Desktop Entry]
Name=GridTracker
@ -558,6 +593,7 @@ EOF
}
##################################
# PROPAGATION
##################################
@ -939,7 +975,6 @@ wget https://sourceforge.net/projects/repeater-start/files/$REPEAT_LATEST
sudo dpkg -i $REPEAT_LATEST
}
##################################
# JTDX
##################################

Wyświetl plik

@ -512,6 +512,24 @@ sudo mv /run/user/$UID/packetsearch.desktop /usr/share/applications/
}
##################################
# Reference Documents
##################################
HDOCS() {
cd ${HOME}/Documents/
mkdir -p Reference
ln -s ${HOME}/Documents/Reference ${HOME}/Desktop/Reference
cd Reference
wget --tries 2 --connect-timeout=60 https://icomamerica.com/en/amateur/amateurtools/US-BandPlan-Update-1-2020.pdf
wget --tries 2 --connect-timeout=60 https://icomamerica.com/en/amateur/amateurtools/US-Grid-Square-Map-03-05-2019.pdf
wget --tries 2 --connect-timeout=60 https://icomamerica.com/en/amateur/amateurtools/2013_ITU_CQ_WorldMaps.pdf
wget --tries 2 --connect-timeout=60 https://icomamerica.com/en/amateur/amateurtools/HamRadioTerms-2011.pdf
wget --tries 2 --connect-timeout=60 http://www.arrl.org/files/file/Regulatory/Band%20Chart/Band%20Chart.pdf
wget --tries 2 --connect-timeout=60 http://www.arrl.org/files/file/Regulatory/Band%20Chart/Band%20Chart%20-%2011X17%20Color.pdf
wget --tries 2 --connect-timeout=60 http://www.arrl.org/files/file/Get%20on%20the%20Air/Comm%20w%20Other%20Hams-Q%20Signals.pdf
wget --tries 2 --connect-timeout=60 https://www.arrl.org/files/file/Get%20Licensed/Quickstart%20Guide%20EBOOK.pdf
}
##################################
# PiQtSoundModem
##################################

Wyświetl plik

@ -54,7 +54,7 @@ echo "updating flwrap"
sudo sed -i "s/Categories.*/Categories=$CATEGORY/" $FLPATH/flwrap.desktop
fi
if [ -f $FLPATH/flwrap.desktop ]; then
if [ -f $FLPATH/flrig.desktop ]; then
echo "updating flrig"
sudo sed -i "s/Categories.*/Categories=$CATEGORY/" $FLPATH/flrig.desktop
fi

8
update
Wyświetl plik

@ -320,7 +320,7 @@ fi
#If VARA is chosen, make sure we have a Pi 4 to work with.
#As of 02OCT2022 the VARA installer only works with the Pi 4.
VARA_CHK=$(grep VARA ${BASE})
if [ -n $VARA_CHK ]; then
if [ -n "$VARA_CHK" ]; then
FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }')
if [ $FREEMEM -lt 1500 ]; then
echo "Not enough memory available"
@ -356,7 +356,7 @@ for the Hot Spot\r</b>NOTE: The last field is the password for the hotspot. You
connect to your Pi when it is in hotspot mode <b>This password can only contain letters and numbers</b>" \
--title="Build-a-Pi" \
--field="Home Wifi SSID":CB "${LIST}" \
--field="Home Wifi Password" \
--field="Home Wifi Password":H \
--field="Hot Spot Password" \
--button="Exit":1 \
--button="Continue":2 \
@ -463,6 +463,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "PAT-MENU" "$PATMENU" "Control for Pat Winlink" \
false "CHIRP" "$CHIRP" "Program Radios" \
false "GARIM" "$GARIM" "File Transfer Program " \
false "VARIM" "$VARIM" "Radio Chat VARA" \
false "M0IAX" "$M0IAX" "Tools for JS8Call messages" \
false "CONKY" "$CONKY" "System Information Display" \
false "WSJTX" "$FT8" "Weak signal digital mode software" \
@ -510,7 +511,7 @@ if [ -n "$PATCHECK" ]; then
--image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \
--text="<b>version $VERSION</b>" \
--field="Six Character Grid Square" "$GRID" \
--field="Winlink Password" \
--field="Winlink Password":H \
--field="<b>Password is case sensitive</b>":LBL \
--button="Continue":2)
GRID=$(echo $INFO | awk -F "|" '{print $1}')
@ -533,6 +534,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "PACKETSEARCH" "$PACKETSEARCH" "Winlink Packet Tool" \
false "CALLSIGN" "${CALLSIGN}" "Call Sign Lookup Utility" \
false "TEMPCONVERT" "$TEMPCONVERT" "Temperature Converter" \
false "HDOCS" "$HDOCS" "Reference Materials PDFs" \
false "GPARTED" "$GPARTED" "Disk Utility Application" \
false "RTC" "$RTC" "Real Time Clock" \
false "SHOWLOG" "$SHOWLOG" "Log File Viewer" \