Porównaj commity

..

No commits in common. "31b9da217aeefb1480e148c05121437043a572a4" and "3175e9d899b69ddbb6feaa874eb54bb6f1e46f53" have entirely different histories.

7 zmienionych plików z 28 dodań i 107 usunięć

Wyświetl plik

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

Wyświetl plik

@ -251,28 +251,28 @@ CHECK() {
# CHRIP
#----------------------------------------------------#
echo "Checking Chirp"
if ! hash chirp 2>/dev/null; then
if ! hash chirpw 2>/dev/null; then
echo "CHIRP=Not_Installed" >> $UPDATEFILE
else
#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; }
CP=$(chirp --version)
echo "CHIRP=Installed" >> $UPDATEFILE
fi
OLDCODE(){
#old code left for reference
if ! hash chirpw 2>/dev/null; then
echo "CHIRP=Not_Installed" >> $UPDATEFILE
else
CP=$(chirpw --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)
NEWCHIRP=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ |
grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8)
if (($(echo "${NEWCHIRP} ${CHIRP}" | awk '{print ($1 > $2)}'))); then
echo "CHIRP=NEEDS-UPDATE" >> $UPDATEFILE
echo "CHIRP=NEEDS-UPDATE" >> $UPDATEFILE
else
echo "CHIRP=is_latest_version" >> $UPDATEFILE
echo "CHIRP=is_latest_version" >> $UPDATEFILE
fi
fi
}
#----------------------------------------------------#
# DIREWOLF
#----------------------------------------------------#
@ -341,23 +341,6 @@ 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
#----------------------------------------------------#
@ -726,12 +709,10 @@ 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 [ -z "$REPEAT_CURRENT_VER" ]; then
echo "REPEAT=Not_Installed" >> $UPDATEFILE
elif (($(echo "${REPEAT_LATEST_VER} ${REPEAT_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then
if (($(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
CHECK

Wyświetl plik

@ -432,7 +432,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi
if [ ${BUT} = 3 ]; then
ADDAPPS=(CONKY PI-APRS CHIRP GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL
GRIDCALC CQRLOG REPEAT)
@ -483,7 +483,6 @@ 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" \
@ -505,7 +504,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi
if [ ${BUT} = 3 ]; then
UTILAPPS=(DIPOLE PACKETSEARCH CALLSIGN TEMPCONVERT HDOCS GPARTED SHOWLOG PISTATS TELNET PITERM QTSOUND SECURITY YGATE BPQ BATT VNC XYGRIB)
UTILAPPS=(DIPOLE PACKETSEARCH CALLSIGN TEMPCONVERT 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,11 +1,5 @@
version=3.3.1
version=3.3.0
3.3.1 Fix Chirp not installing on 64bit OS - https://github.com/km4ack/pi-build/pull/452
Fix Chitp 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
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

Wyświetl plik

@ -415,22 +415,10 @@ 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
@ -485,27 +473,6 @@ 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
##################################
@ -514,17 +481,19 @@ QSSTV() {
cd ${BUILDDIR} || return
git clone https://github.com/ON4QZ/QSSTV
cd QSSTV/src || 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
qmake
make
sudo make install
sudo make clean
cd ${BUILDDIR} || return
sudo mkdir -p /usr/local/share/pixmaps/
sudo cp ${BUILDDIR}/QSSTV/src/icons/qsstv.png /usr/local/share/pixmaps/
rm *.gz
mkdir -p /usr/local/share/pixmaps/
sudo cp ${BUILDDIR}/${SSTVTAR}/icons/qsstv.png /usr/local/share/pixmaps/
cat >qsstv.desktop <<EOF
[Desktop Entry]
@ -975,6 +944,7 @@ wget https://sourceforge.net/projects/repeater-start/files/$REPEAT_LATEST
sudo dpkg -i $REPEAT_LATEST
}
##################################
# JTDX
##################################

Wyświetl plik

@ -512,24 +512,6 @@ 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
##################################

2
update
Wyświetl plik

@ -463,7 +463,6 @@ 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" \
@ -534,7 +533,6 @@ 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" \