Merge pull request #376 from km4ack/dev

Dev
pull/377/head
KM4ACK 2022-02-04 08:06:22 -06:00 zatwierdzone przez GitHub
commit dacbe83304
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
7 zmienionych plików z 57 dodań i 125 usunięć

Wyświetl plik

@ -242,6 +242,13 @@ CHECK() {
# CHRIP
#----------------------------------------------------#
echo "Checking Chirp"
if ! hash chirpw 2>/dev/null; then
echo "CHIRP=Not_Installed" >> $UPDATEFILE
else
echo "CHIRP=Installed" >> $UPDATEFILE
fi
OLDCODE(){
#old code left for reference
if ! hash chirpw 2>/dev/null; then
echo "CHIRP=Not_Installed" >> $UPDATEFILE
else
@ -256,6 +263,7 @@ CHECK() {
echo "CHIRP=is_latest_version" >> $UPDATEFILE
fi
fi
}
#----------------------------------------------------#
# DIREWOLF
#----------------------------------------------------#

Wyświetl plik

@ -1,4 +1,13 @@
version=3.2.1
version=3.2.2
3.2.2 Add cqrlog built from source - https://github.com/km4ack/pi-build/issues/349
Fix HAMRS install (Thanks WF5W)- https://github.com/km4ack/pi-build/issues/345
Fix Pat Menu Update status - https://github.com/km4ack/pi-build/issues/371
Fix RTC install - https://github.com/km4ack/pi-build/issues/358
Fix Chirp update status - https://github.com/km4ack/pi-build/issues/373
Fix NMEA statement in chrony.conf (Thanks DC2JR) - https://github.com/km4ack/pi-build/issues/374
Add gps library to support direwolf (libgps-dev)
Fix YAAC reopening after close - https://github.com/km4ack/pi-build/issues/375
3.2.1 Fix wsjtx install - https://github.com/km4ack/pi-build/issues/365
Fix gridtracker install - https://github.com/km4ack/pi-build/issues/362

Wyświetl plik

@ -82,31 +82,16 @@ PAT-MENU() {
fi
cd ${HOME}
git clone https://github.com/km4ack/patmenu2.git ${HOME}/patmenu2
#####################################
# Pat 12 Temp Workaround
#####################################
#This will move the user to the "version12" branch of the Pat Menu code
#until this can be implemented into the main branch of code. This will
#allow Pat Menu to support both the new version of Pat as well as older
#versions. This section of code needs to be removed once the "version12"
#branch is merged with the master branch
PAT_VERSION=$(pat version | awk '{print $2}' | sed 's/v0.//;s/.0//')
if [ "$PAT_VERSION" -le 11 ]; then
echo "pat version 11 detected"
else
echo "pat version 12 or greater detected"
echo "moving pat menu to the version12 branch"
#Verify that pat is on master branch. Pat can remain on an old branch
#due to a workaround when moving to Pat version 12. This caused Pat Menu
#to constantly report that it needed an update with the BAP update tool.
PAT_VER=$(grep release $HOME/patmenu2/changelog | head -1 | sed 's/release=//;s/\.//g')
if [ "$PAT_VER" -lt 260 ]; then
cd $HOME/patmenu2
git pull
git checkout version12
git checkout master
fi
#####################################
# END Pat 12 Temp Workaround
#####################################
bash ${HOME}/patmenu2/setup
sed -i "s/N0CALL/${CALL}/" ${HOME}/patmenu2/config
sed -i 's/1,0/3,0/g' ${HOME}/patmenu2/config
@ -360,45 +345,19 @@ PYQSO() {
##################################
CQRLOG() {
sudo apt-get install -y cqrlog
OLDCODE(){
#Old code left for reference
sudo apt-get install -y lcl-2.0 lazarus-2.0 fp-compiler-3.0.4 fpc-3.0.4 libssl-dev git build-essential \
libmariadbclient-dev lazarus-ide lcl lcl-gtk2 lcl-nogui lcl-units lcl-utils lazarus lazarus-doc lazarus-src \
sudo apt-get install -y lcl-2.0 lazarus-2.0 fp-compiler-3.2.0 fpc-3.2.0 libssl-dev git build-essential \
libmariadb-dev-compat lazarus-ide lcl lcl-gtk2 lcl-nogui lcl-units lcl-utils lazarus lazarus-doc lazarus-src \
fp-units-misc fp-units-rtl fp-utils fpc fpc-source libssl-dev default-mysql-client-core default-mysql-server \
default-mysql-server-core galera-3 gawk libcgi-fast-perl libcgi-pm-perl libconfig-inifiles-perl libdbd-mysql-perl \
libdbi-perl libencode-locale-perl libfcgi-perl libhamlib-utils libhamlib2 libhtml-parser-perl libhtml-tagset-perl \
default-mysql-server-core gawk libcgi-fast-perl libcgi-pm-perl libconfig-inifiles-perl libdbd-mysql-perl \
libdbi-perl libencode-locale-perl libfcgi-perl libhtml-parser-perl libhtml-tagset-perl \
libhtml-template-perl libhttp-date-perl libhttp-message-perl libio-html-perl liblwp-mediatypes-perl \
libmariadb-dev-compat libnetpbm10 libreadline5 libterm-readkey-perl libtimedate-perl liburi-perl \
mariadb-client-10.3 mariadb-client-core-10.3 mariadb-server-10.3 mariadb-server-core-10.3 socat xplanet xplanet-images
sudo ln -s /usr/lib/arm-linux-gnueabihf/libmariadbclient.so /usr/lib/libmysqlclient.so
cd ${BUILDDIR}
git clone https://github.com/ok2cqr/cqrlog.git
cd cqrlog
make
sudo make install
sudo make clean
cd ..
#rm -rf cqrlog
cat >cqrlog.desktop <<EOF
[Desktop Entry]
Name=CQRLOG
Comment=Amateur Radio Logging Software
GenericName=CQRLOG
Exec=cqrlog
Icon=cqrlog
Type=Application
Terminal=false
Categories=HamRadio;Utility
EOF
sudo mv cqrlog.desktop /usr/share/applications/
}
cd $HOME
git clone https://github.com/ok2cqr/cqrlog.git
cd $HOME/cqrlog
make
sudo make install
}
##################################
@ -547,6 +506,10 @@ YAAC() {
sudo apt-get install -y librxtx-java openjdk-10-dbg
mkdir -p ${HOME}/YAAC
cd ${HOME}/YAAC || return
#Fix issue 375 to prevent YAAC from reopening
if [ -f ${HOME}/YAAC/YAAC ]; then
rm ${HOME}/YAAC/YAAC
fi
touch YAAC
echo "#!/bin/bash" >>YAAC
echo "java -jar ${HOME}/YAAC/YAAC.jar" >>YAAC
@ -822,13 +785,18 @@ HAMRS=$(ls | grep hamrs-)
mv ${HAMRS} hamrs
chmod +x hamrs
sudo mv hamrs /usr/local/bin/
#following four lines added to resolve issue #345
sudo apt install -y fuse
sudo modprobe fuse
sudo groupadd fuse
sudo usermod -a -G fuse pi
#create menu item and download icon
cat >${HOME}/Downloads/hamrs.desktop <<EOF
[Desktop Entry]
Name=HAMRS
Comment=POTA Logging Software
Exec=/usr/local/bin/hamrs
Exec=/usr/local/bin/hamrs --no-sanbox
Icon=/usr/share/pixmaps/hamrs-logo.png
Terminal=false
Type=Application

Wyświetl plik

@ -61,10 +61,13 @@ GPS() {
echo "##########################"
echo "# Installing GPS #"
echo "##########################"
sudo apt install -y python3-gps gpsd-tools gpsd-clients gpsd chrony python3-gi-cairo
sudo apt install -y python3-gps gpsd-tools gpsd-clients gpsd chrony python3-gi-cairo libgps-dev
sudo mv /etc/default/gpsd /etc/default/gpsd.org
sudo wget https://raw.githubusercontent.com/km4ack/pi-scripts/master/gpsd -P /etc/default/
sudo echo "refclock SHM 0 offset 0.5 delay 0.2 refid NMEA" | tee -a /etc/chrony/chrony.conf
CHRONYCHK=$(grep "refclock SHM 0 offset 0.5 delay 0.2 refid NMEA" /etc/chrony/chrony.conf)
if [ -z "$CHRONYCHK" ]; then
echo "refclock SHM 0 offset 0.5 delay 0.2 refid NMEA" | sudo tee -a /etc/chrony/chrony.conf
fi
#line below added per this issue - https://github.com/km4ack/pi-build/issues/146 24SEPT2020
ln -s /lib/systemd/system/gpsd.service /etc/systemd/system/multi-user.target.wants/
@ -185,7 +188,8 @@ DIREWOLF() {
cd ${BUILDDIR} || return
git clone https://www.github.com/wb2osz/direwolf
cd ${BUILDDIR}/direwolf || return
mkdir build && cd build
mkdir build
cd build
sudo apt-get install -y libasound2-dev cmake libudev-dev
cmake ..
make -j 4

Wyświetl plik

@ -108,8 +108,9 @@ EOF
##################################
# Real Time Clock
##################################
#Based on directions from the following web site
#Based on directions from the following web sites
#https://thepihut.com/blogs/raspberry-pi-tutorials/17209332-adding-a-real-time-clock-to-your-raspberry-pi
#https://pi3g.com/2021/05/20/enabling-and-checking-i2c-on-the-raspberry-pi-using-the-command-line-for-your-own-scripts/
RTC() {
DOUBLE=$(sudo i2cdetect -y 1 | grep UU)
@ -123,16 +124,11 @@ RTC() {
else
IC2ACTIVE=$(ls /dev/*i2c*)
IC2ACTIVE=$(sudo raspi-config nonint get_i2c)
if [ ${IC2ACTIVE} = '/dev/i2c-1' ]; then
echo "I2C is active"
else
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="Please enable I2C interface in the Raspberry Pi Configuration and try again" \
--button=gtk-close
exit 1
if [ ${IC2ACTIVE} = 1 ]; then
#enable i2c
sudo raspi-config nonint do_i2c 0
fi
NOW=$(date)

Wyświetl plik

@ -1,12 +1,9 @@
# Description
Occasionally small changes (patches) are needed for the Build a Pi code. These changes are usually due to a temporary or minor issue that needs to be addressed but doesn't warrent a full release of BAP. This directory holds those patches. Below you will find a description for each patch that is currently available. If a patch is currently available, the Build a Pi Update Tool will notify you and guide you through installing the patch.
# Gridtracker
This patch will install the latest version of grid tracker.
# test-patch
This patch is for testing purposes only. It will echo "This is a test patch" to the terminal.
Last Edit 22DEC2021
PATCH=YES
PATCH=NO

Wyświetl plik

@ -1,50 +0,0 @@
#!/bin/bash
#This test-patch script should serve as a
#template for future patch scripts.
#20210805 KM4ACK
#Give this patch a unique name. A good idea is
#to give it the application name that is being
#patched followed by the date. ie FLDIDI20210805
PATCHNAME=gridtracker20211222
PATCHFILE=$HOME/.config/patch
touch $PATCHFILE
###############################
#Patch script commands go here#
###############################
cd ${HOME} || return
sudo apt-get install -y libgconf-2-4
GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm32 | sed 's/.*href="//;s/">.*//')
wget --tries 2 --connect-timeout=60 $GRIDDLL
GRIDTAR=$(echo $GRIDDLL | sed 's/.*\///g')
tar -xzvf $GRIDTAR
rm GridTracker*.gz
OLDFOLDER=$(ls | grep GridTracker*-linux-arm32)
mv "$OLDFOLDER" $HOME/GridTracker
cat >gridtracker.desktop <<EOF
[Desktop Entry]
Name=GridTracker
Comment=GridTracker
GenericName=GridTracker, a WSJT-X Companion
Exec=${HOME}/GridTracker/GridTracker --disable-accelerated-2d-canvas --num-raster-threads=2
Icon=${HOME}/GridTracker/gridtracker.png
Path=${HOME}/GridTracker
Type=Application
Encoding=UTF-8
Terminal=false
Categories=HamRadio;
EOF
sudo mv gridtracker.desktop /usr/share/applications/
#############################################
#write patch name to a file so we can #
#look and see if it has been applied before.#
#This is checked by the patch-menu script #
#before running the patch #
#############################################
echo "$PATCHNAME" >> $PATCHFILE