Merge pull request #62 from km4ack/dev

Dev
This commit is contained in:
KM4ACK 2024-04-02 06:29:59 -05:00 committed by GitHub
commit 4172ad61be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 90 additions and 106 deletions

View file

@ -1,63 +0,0 @@
BAPP=4.0
ID=DIREWOLF_DEV
Name=direwolf_dev
Comment='Software TNC'
Ver=1.7
localVer=1.7
# Install current dev version (1.7) to enable DNS-SD / Zeroconf for KISS TNC service to work with MobileMail for iOS
INSTALL(){
CLEANSOURCE(){
#this function removes any old source files before
#new files are downloaded for installation. This
#function is called by install functions below.
PACKAGE=$(ls $BUILDDIR | grep $PACKAGE)
if [ -d $BUILDDIR/$PACKAGE ]; then
sudo rm -rf $BUILDDIR/$PACKAGE*
fi
}
PACKAGE=direwolf_dev
CLEANSOURCE
cd ${BUILDDIR} || return
# changed to included --branch dev
git clone --branch dev https://www.github.com/wb2osz/direwolf
cd ${BUILDDIR}/direwolf || return
mkdir build
cd build
sudo apt-get install -y libasound2-dev cmake libudev-dev
# Install libavahi-client-dev, as required for DNS-SD registration of service
sudo apt-get install -y libavahi-client-dev
cmake ..
make -j 4
sudo make install
make install-conf
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 CAT through FLRIG\n#PTT RIG 2 localhost:4532' ${HOME}/direwolf.conf
}
VERSION(){
if ! hash direwolf 2>/dev/null; then
CURRENT=0
wget -P /tmp/ https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md >/dev/null 2>&1
NEWVER=$(cat /tmp/CHANGES.md | head -5 | tail -1 | awk '{ print $3 }')
else
CURRENT=$(direwolf -S -t 0 | head -1 | sed 's/Dire\ Wolf\ version\ //')
wget -P /tmp/ https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md >/dev/null 2>&1
NEWVER=$(cat /tmp/CHANGES.md | head -5 | tail -1 | awk '{ print $3 }')
fi
}
REMOVE(){
DIR=$(ls ${BUILDDIR} | grep direwolf)
cd ${BUILDDIR}/${DIR}/build
sudo make uninstall
rm ${HOME}/direwolf.conf ${HOME}/telem-balloon.conf ${HOME}/telem-m0xer-3.txt ${HOME}/telem-volts.conf ${HOME}/sdr.conf
}

View file

@ -7,7 +7,6 @@ localVer=
INSTALL(){
source ${HOME}/pi-build/config || return
#install LinBPQ
cd || return
##########################################################################

View file

@ -14,16 +14,16 @@ INSTALL(){
#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 --tries 2 --connect-timeout=60 $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

View file

@ -7,13 +7,13 @@ localVer=0
INSTALL(){
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 \
sudo apt-get install -y lcl-2.2 lazarus-2.2 fp-compiler-3.2.2 fpc-3.2.2 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 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 \
libmariadb-dev-compat libnetpbm11 readline-common libterm-readkey-perl libtimedate-perl liburi-perl \
if [ -d ${BUILDDIR}/cqrlog ]; then
rm -rf ${BUILDDIR}/cqrlog

View file

@ -9,8 +9,8 @@ localVer=0
INSTALL(){
#install PHP7.4 if not installed
#this will also install apache2
if ! hash php7.4 2>/dev/null; then
sudo apt install -y php7.4
if ! hash php8.2 2>/dev/null; then
sudo apt install -y php8.2
fi
#install ghostwriter if needed
#this is used to mod the new index.html

View file

@ -26,7 +26,8 @@ INSTALL(){
PACKAGE=hamlib
CLEANSOURCE
sudo apt install libusb-1.0-0 libusb-1.0-0-dev
sudo apt install libusb-1.0-0 libusb-1.0-0-dev swig
pyver=$(python3 -V | awk '{print $2}' | awk -F. '{print $1"."$2}')
cd ${BUILDDIR} || return
NEWRIG=$(curl -s https://sourceforge.net/projects/hamlib/files/latest/download |
grep -o https://downloads.sourceforge.net/project/hamlib/hamlib/[0-9].[0-9] |
@ -49,7 +50,7 @@ INSTALL(){
rm hamlib*.tar.gz
cd hamlib-4.4
./configure
./configure --with-xml-support --with-python-binding PYTHON_VERSION=$pyver
make -j $BAPCORE
sudo make install
sudo ldconfig

View file

@ -40,8 +40,6 @@ INSTALL(){
#lines below configure pat with user info
pat http &
sudo killall pat
sed -i "s/\"mycall\": \".*\",/\"mycall\": \"${CALL}\",/" ${FIG}
sudo systemctl start pat@${WHO}
sudo systemctl enable pat@${WHO}
cd ${DIR}
PAT_VERSION=$(pat version | awk '{print $2}' | sed 's/v0.//;s/.0//')
@ -54,7 +52,7 @@ INSTALL(){
FIG=$HOME/.wl2k/config.json
else
echo "pat version 12 or greater detected"
FIG=$XDG_CONFIG_HOME/pat/config.json
FIG=$HOME/.config/pat/config.json
fi
#set callsign
sed -i "s/\"mycall\": \".*\",/\"mycall\": \"${CALL}\",/" ${FIG}
@ -73,6 +71,7 @@ INSTALL(){
jq '.hamlib_rigs = {'\"my-rig\"': {"address": "127.0.0.1:4532", "network": "tcp"}}' >~/Desktop/config.json
mv ${HOME}/Desktop/config.json ${FIG}
sed -i 's/"enable_http": false,/"enable_http": true,/' ${FIG}
sudo systemctl start pat@${WHO}
if [ -f ${DIR}/config.json ]; then
mv ${DIR}/config.json ${HOME}/.wl2k/

View file

@ -14,7 +14,7 @@ INSTALL(){
else
sudo dpkg --add-architecture armhf
sudo apt update
sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf
sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libqt5multimedia5:armhf libfftw3-bin:armhf
fi
wget --tries 2 --connect-timeout=60 https://www.cantab.net/users/john.wiseman/Downloads/Beta/piQtTermTCP
sudo chmod +x piQtTermTCP

View file

@ -14,7 +14,7 @@ INSTALL(){
else
sudo dpkg --add-architecture armhf
sudo apt update
sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf
sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libfftw3-bin:armhf
fi
cd ${HOME}/Downloads || return
wget --tries 2 --connect-timeout=60 https://www.cantab.net/users/john.wiseman/Downloads/Beta/piQtSoundModem

View file

@ -27,7 +27,8 @@ INSTALL(){
PACKAGE=tqsl
CLEANSOURCE
sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.0-gtk3-dev
sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.2-dev sqlite3 libsqlite3-dev
sudo ldconfig
cd ${BUILDDIR} || return
CUR=$(curl -s http://www.arrl.org/tqsl-download | grep "for Linux" | sed 's/.*TQSL //' | awk '{print $1}')
wget --tries 2 --connect-timeout=60 http://www.arrl.org/tqsl/tqsl-${CUR}.tar.gz
@ -38,7 +39,7 @@ INSTALL(){
make
sudo make install
sudo make clean
sudo cp ${BUILDDIR}/tqsl-${CUR}/apps/tqsl.desktop /usr/share/applications/
}

View file

@ -18,14 +18,14 @@ INSTALL(){
sudo rm -rf $HOME/.bap-source-files/wsjtx*
if [ `getconf LONG_BIT` = '64' ]; then
#64 bit link
FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep arm64 | grep https | sed 's/.*href="//' | sed 's/arm64.deb.*/arm64.deb/')
FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep arm64 | head -1 | sed 's/.*">//;s/<\/.*//')
else
#32bit link
FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep armhf | grep https | sed 's/.*href="//' | sed 's/_armhf.deb".*/_armhf.deb/')
FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep armhf | head -1 | sed 's/.*">//;s/<\/.*//')
fi
PKGNAME=$(echo $FT8PKG | awk -F "/" '{print $NF}')
PKGNAME="https://wsjt.sourceforge.io/downloads/${FT8PKG}"
wget --tries 2 --connect-timeout=60 $FT8PKG
sudo dpkg -i $PKGNAME
sudo apt install --fix-broken -y

View file

@ -8,7 +8,7 @@ localVer=2.1.7
INSTALL(){
sudo apt-get -y install build-essential automake git xorg-dev libmotif-dev graphicsmagick \
gv libcurl4-openssl-dev shapelib libshp-dev libpcre3-dev libproj-dev libdb-dev python-dev \
gv libcurl4-openssl-dev shapelib libshp-dev libpcre3-dev libproj-dev libdb-dev python-dev-is-python3 \
libax25-dev libwebp-dev libwebp-dev libgraphicsmagick1-dev festival festival-dev
cd ${BUILDDIR} || return

View file

@ -6,30 +6,47 @@ Ver=
localVer=
W3='https://chirp.danplanet.com/projects/chirp/wiki/Home'
MENU(){
cat >chirp.desktop <<EOF
[Desktop Entry]
Name=CHIRP
GenericName=CHIRP
Comment=Radio Programming
Exec=${HOME}/.local/bin/chirp
Terminal=false
Type=Application
Categories=HamRadio;
EOF
sudo -A mv chirp.desktop /usr/local/share/applications/
}
INSTALL(){
CUR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
sudo -A apt install -y flatpak
sudo -A apt install python-wxtools python3-pip -y
cd ${BAPSRC}
LATEST=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | grep flatpak | sed 's/.*href="//;s/">.*//' | head -1)
wget https://trac.chirp.danplanet.com/chirp_daily/LATEST/$LATEST
sudo -A flatpak install -y $LATEST
date=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
wheel=https://trac.chirp.danplanet.com/chirp_next/next-${date}/chirp-${date}-py3-none-any.whl
wget ${wheel}
pip install ${wheel} --force-reinstall
MENU
}
REMOVE(){
sudo flatpak uninstall -y chirp
pkg=$(ls ${BAPSRC} | grep chirp)
pip uninstall ${pkg} -y
cd ${BAPSRC}
rm ${pkg}
}
VERSION(){
CHECK=$(flatpak list | grep chirp)
if [ -z "${CHECK}" ]; then
if ! hash chirp 2>/dev/null; then
CURRENT=0
NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ |
grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8)
NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
else
CURRENT=$(flatpak run com.danplanet.chirp --version | awk '{print $2}' | sed 's/daily-//')
NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ |
grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8)
CURRENT=$(chirp --version | awk '{print $2}' | sed 's/next-//')
NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
fi
}

View file

@ -12,7 +12,7 @@ MENU(){
Name=Conky Prefs
GenericName=Conky Prefs
Comment=Update Conky Layout
Exec=${HOME}/bin/conky/set-conky
Exec=${HOME}/bin/conky/setconky
Icon=${BAPDIR}/data/ico/conky.png
Terminal=false
Type=Application

View file

@ -23,7 +23,8 @@ CLEANSOURCE(){
PACKAGE=hamlib
CLEANSOURCE
sudo -A apt install -y libusb-1.0-0 libusb-1.0-0-dev libnova-0.16-0 libnova-dev
sudo -A apt install -y libusb-1.0-0 libusb-1.0-0-dev libnova-0.16-0 libnova-dev swig libindi-dev libindi-data libindi-plugins
pyver=$(python3 -V | awk '{print $2}' | awk -F. '{print $1"."$2}')
cd ${BAPSRC}
NEWRIG=$(curl -s https://sourceforge.net/projects/hamlib/files/latest/download |
grep -o https://downloads.sourceforge.net/project/hamlib/hamlib/[0-9].[0-9].[0-9] |
@ -33,7 +34,7 @@ CLEANSOURCE(){
tar -xzf hamlib-${NEWRIG}.tar.gz
rm hamlib-${NEWRIG}.tar.gz
cd hamlib-${NEWRIG} || return
./configure
./configure --with-python-binding PYTHON_VERSION=$pyver
make
sudo -A make install
sudo -A ldconfig

View file

@ -49,9 +49,9 @@ REMOVE(){
VERSION(){
NEWVER=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep amd64.deb | grep https | sed 's/.*href="//' | sed 's/.deb.*/.deb/' \
| awk -F "/" '{print $NF}' | sed 's/_amd.*//;s/wsjtx_//')
| awk -F "/" '{print $NF}' | sed 's/_amd.*//;s/wsjtx_//' | tail -1)
CURRENT=$(ls $HOME/.bap-source-files/| grep wsjtx | sed 's/wsjtx_//' | sed 's/_amd64.deb//')
CURRENT=$(ls $HOME/.bap-source-files/| grep wsjtx | sed 's/wsjtx_//' | sed 's/_amd64.deb//' | tail -1)
if [ -z "$CURRENT" ]; then
CURRENT=0
fi

View file

@ -15,6 +15,15 @@ catch() {
echo -e "\nCRITICAL: parsing error on:"
}
pi_check(){
#check is Pi OS is 32 or 64 bit
if [ `getconf LONG_BIT` = 32 ]; then
CPU=32
elif [ `getconf LONG_BIT` = 64 ]; then
CPU=64
fi
}
#lscpu to pull out args with sed to share to script.
rm -f /tmp/bap-env-*
lscpu > /tmp/bap-env-lscpu
@ -27,10 +36,10 @@ cpu=$(grep processor /proc/cpuinfo | wc -l)
case "$arch" in
armv7l)
CPU=32
pi_check
;;
aarch64)
CPU=64
pi_check
;;
x86_64)
CPU=64

View file

@ -1,5 +1,25 @@
version=4.0.1
version=4.0.2
4.0.2 Update pi chirp to "next" version of chirp
Update x86 chrip to "next" version of chirp
update pi/pat.bapp for wayland
fix depends for piqttermtcp
update EES.bapp to php8.2 (issue 48)
update TQSL.bapp to libwxgtk3.2-dev (issue 48)
update XASTIR.bapp to python-dev-is-python3 (issue 48)
update CQRLOG.bapp depends (issue 48)
fix BPQ.bapp. remove legacy code. (issue 47)
add python binding to HAMLIB.bapp Pi (issue 45)
fixed set-conky. Thanks Bill, AA6BD! (issue 52)
add python binding to HAMLIB.bapp x86 (issue 45)
remove direwolf-dev from community since V1.7 is stable now
fix conky menu for x86 (issue 42)
ressolve issue 40 32/64bit OS check
Update WSJTX on Pi (issue 39)
add libfftw3-bin:armhf depends for piqtterm
add libfftw3-bin:armhf depends for piqtsoundmodem
add sqlite to TQSL.bapp (issue 56) Thanks KO4HXC
resolve wsjtx update error (issue 61)
4.0.1 Add build-essential to all builds
add git install before running bapps
add curl to all builds https://github.com/km4ack/73Linux/issues/28

View file

@ -1,6 +1,6 @@
CONFIG_DIR=$HOME/bin/conky
CONKY_TMP=/tmp/conky.txt
CPU=$(lscpu | grep Architecture | grep arm)
CPU=$(lscpu | grep "Vendor ID" | grep ARM)
if [ -z "$CPU" ]; then
CONFIG_FILES=${CONFIG_DIR}/*.86
TYPE=".86"