Merge pull request #165 from km4ack/dev

Dev
2026-08-13 17:51:54 -04:00 · 2025-08-05 14:26:33 -05:00 · 2025-08-05 14:26:33 -05:00 · 73a9e74ffd
commit 73a9e74ffd
parent 8ab2317ff0 40e9d37522
5 changed files with 172 additions and 25 deletions
--- a/app/stable/x86_64/JS8.bapp
+++ b/app/stable/x86_64/JS8.bapp
@ -2,8 +2,24 @@ BAPP=4.0
 ID=JS8
 Name=JS8Call
 Comment="Weak Signal Digital Mode Software"
-Ver=Update:2.2.0
-localVer=0
+Ver=
+localVer=
+
+MENU(){
+    cat >js8call.desktop <<EOF
+[Desktop Entry]
+Name=JS8Call
+GenericName=JS8Call
+Comment=Weak Signal Digital Mode Software
+Exec=${file}
+Icon=
+Terminal=false
+Type=Application
+Categories=Utility
+EOF
+
+    sudo -A mv js8call.desktop /usr/local/share/applications/
+}

 INSTALL(){

@ -11,26 +27,39 @@ INSTALL(){
    mkdir -p ${BAPSRC}

    cd ${BAPSRC}
-    sudo -A apt install libqt5multimedia5-plugins
-    wget --tries 2 --connect-timeout=60 http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb
+    REPO="js8call/js8call"
+    API_URL="https://api.github.com/repos/${REPO}/releases/latest"
+    response=$(curl -s "$API_URL")
+    appimage_url=$(echo "$response" | jq -r '.assets[] | select(.name | test("(?i)AppImage$")) | .browser_download_url')
+    wget ${appimage_url}
    file=$(ls | grep js8call)
-    sudo -A dpkg -i $file
-    sudo -A apt --fix-broken install -y
-    sudo -A dpkg -i $file
-    sudo -A apt --fix-broken install -y
-    rm $file
+    chmod +x ${file}
+    sudo -A mv ${file} /usr/bin
+    MENU
+
 }

 VERSION(){
-    if [ ! -f /usr/bin/js8call ]; then
+ck=$(ls /usr/bin/ | grep js8call)
+
+if [ -z "${ck}" ]; then
        CURRENT=0
-        NEWVER=$(curl --max-time 20 -s http://files.js8call.com/latest.html | grep amd64 | head -1 | awk -F "/" '{print $4}')
-    else
-        CURRENT=$(dpkg --list | grep js8call | awk '{print $3}')
-        NEWVER=$(curl --max-time 20 -s http://files.js8call.com/latest.html | grep amd64 | head -1 | awk -F "/" '{print $4}')
-    fi
+        REPO="js8call/js8call"
+        API_URL="https://api.github.com/repos/${REPO}/releases/latest"
+        response=$(curl -s "$API_URL")
+        NEWVER=$(echo "$response" | jq -r .tag_name | sed 's/v//')
+else
+        CURRENT=$(ls /usr/bin/| grep js8 | sed 's/js8call_//' | sed 's/-x86.*//')
+        REPO="js8call/js8call"
+        API_URL="https://api.github.com/repos/${REPO}/releases/latest"
+        response=$(curl -s "$API_URL")
+        NEWVER=$(echo "$response" | jq -r .tag_name | sed 's/v//')
+fi
+
 }

 REMOVE(){
-sudo -A rm /usr/bin/js8call /usr/share/applications/js8call.desktop
+file=$(ls /usr/bin | grep js8call)
+sudo -A rm ${file} /usr/local/share/applications/js8call.desktop    #removes appimage
+sudo -A rm /usr/bin/js8call /usr/share/applications/js8call.desktop #removes older version
 }
--- a/app/stable/x86_64/PATMENU3.bapp
+++ b/app/stable/x86_64/PATMENU3.bapp
@ -0,0 +1,114 @@
+BAPP=4.0
+ID=PATMENU_3
+Name=PATMENU_3
+Comment="Helper app for Pat Winlink"
+Ver=
+localVer=
+W3=
+
+DEPENDS(){
+    #voacap
+    if ! hash voacapl 2>/dev/null; then
+        sudo -A apt install build-essential gfortran -y
+        cd ${HOME}/Downloads
+        wget https://github.com/jawatson/voacapl/archive/refs/tags/v.0.7.6.zip
+        unzip v.0.7.6.zip
+        cd voacapl-v.0.7.6
+        ./configure
+        make
+        sudo -A make install
+        makeitshfbc
+    fi
+
+    #wwl
+    if ! hash locator 2>/dev/null; then
+        cd ${HOME}/Downloads
+        wget http://db.net/downloads/wwl+db-1.3.tgz
+        tar -xvzf wwl+db-1.3.tgz
+        cd wwl+db-1.3
+        make
+        sudo -A make install
+    fi
+}
+
+MENU(){
+cat >patmenu3.desktop <<EOF
+[Desktop Entry]
+Name=PatMenu 3
+GenericName=Pat Menu 3
+Comment=Helper application for Pat Winlink
+Exec=$HOME/patmenu3/patmenu
+Icon=$HOME/patmenu3/pmlogo.png
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+EOF
+
+sudo -A mv patmenu3.desktop /usr/local/share/applications
+}
+
+INSTALL(){
+    DEPENDS
+	if [ -d $HOME/patmenu3 ]; then
+		#backup existing config files
+		mkdir -p /run/user/$UID/patmenu_config
+		cp -r $HOME/patmenu3/data/* /run/user/$UID/patmenu_config/
+		rm -rf $HOME/patmenu3
+        #install
+		cd $HOME
+		git clone https://github.com/km4ack/patmenu3.git && bash $HOME/patmenu3/install
+        #make files executable
+        chmod +x $HOME/patmenu3/patmenu
+        chmod +x $HOME/patmenu3/bin/getgrid $HOME/patmenu3/bin/pat-contacts \
+        $HOME/patmenu3/bin/getardoplist $HOME/patmenu3/bin/stats $HOME/patmenu3/bin/.getardoplist-cron
+        chmod +x $HOME/patmenu3/bin/catelog/*
+        chmod +x $HOME/patmenu3/bin/config/*
+        chmod +x $HOME/patmenu3/bin/find-gateways/*
+        chmod +x $HOME/patmenu3/bin/manage_mail/*
+        chmod +x $HOME/patmenu3/bin/modems/*
+        chmod +x $HOME/patmenu3/bin/pat_admin/*
+        chmod +x $HOME/patmenu3/bin/pos/*
+        chmod +x $HOME/patmenu3/bin/sms/add-carrier $HOME/patmenu3/bin/sms/current-carriers \
+        chmod +x $HOME/patmenu3/bin/voacap/rel.ph $HOME/patmenu3/bin/voacap/voa.sh $HOME/patmenu3/bin/voacap/voacap \
+        $HOME/patmenu3/bin/sms/manage-sms $HOME/patmenu3/bin/sms/remove-carrier $HOME/patmenu3/bin/sms/winlink2sms
+		MENU
+        #restore data files
+		cp -r /run/user/$UID/patmenu_config/* $HOME/patmenu3/data/
+	else
+		cd $HOME
+		git clone https://github.com/km4ack/patmenu3.git && bash $HOME/patmenu3/install
+		cd $HOME/patmenu3
+		sed -i "s/N0CALL/${CALL}/" ${HOME}/patmenu3/data/config
+		sed -i 's/1,0/3,0/g' ${HOME}/patmenu3/data/config
+        #make files executable
+        chmod +x $HOME/patmenu3/patmenu
+        chmod +x $HOME/patmenu3/bin/getgrid $HOME/patmenu3/bin/pat-contacts \
+        $HOME/patmenu3/bin/getardoplist $HOME/patmenu3/bin/stats $HOME/patmenu3/bin/.getardoplist-cron
+        chmod +x $HOME/patmenu3/bin/catelog/*
+        chmod +x $HOME/patmenu3/bin/config/*
+        chmod +x $HOME/patmenu3/bin/find-gateways/*
+        chmod +x $HOME/patmenu3/bin/manage_mail/*
+        chmod +x $HOME/patmenu3/bin/modems/*
+        chmod +x $HOME/patmenu3/bin/pat_admin/*
+        chmod +x $HOME/patmenu3/bin/pos/*
+        chmod +x $HOME/patmenu3/bin/sms/add-carrier $HOME/patmenu3/bin/sms/current-carriers \
+        chmod +x $HOME/patmenu3/bin/voacap/rel.ph $HOME/patmenu3/bin/voacap/voa.sh $HOME/patmenu3/bin/voacap/voacap \
+        $HOME/patmenu3/bin/sms/manage-sms $HOME/patmenu3/bin/sms/remove-carrier $HOME/patmenu3/bin/sms/winlink2sms
+		MENU
+	fi
+}
+
+REMOVE(){
+    rm -rf $HOME/patmenu3
+    sudo -A rm /usr/local/share/applications/patmenu3.desktop
+}
+
+VERSION(){
+    if [ ! -d $HOME/patmenu3 ]; then
+    CURRENT=0
+    NEWVER=$(curl --max-time 20 -s https://raw.githubusercontent.com/km4ack/patmenu3/master/changelog | grep release | head -1 | sed 's/release=//')
+    else
+    CURRENT=$(cat $HOME/patmenu3/changelog | grep release | head -1 | sed 's/release=//')
+    NEWVER=$(curl --max-time 20 -s https://raw.githubusercontent.com/km4ack/patmenu3/master/changelog | grep release | head -1 | sed 's/release=//')
+    fi
+}
--- a/app/stable/x86_64/SECURITY.bapp
+++ b/app/stable/x86_64/SECURITY.bapp
@ -40,7 +40,7 @@ INSTALL(){
    CUR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
    source ${CUR_PATH}/config
    mkdir -p ${BAPSRC}
-
+    sudo -A apt install -y librxtx-java openjdk-17-dbg
    #download PTE & move
    cd $HOME/Downloads
    wget --tries 2 --connect-timeout=60 https://paranoiaworks.mobi/download/files/PTE-PC.zip
@ -60,11 +60,11 @@ INSTALL(){
    MENU

    #install pgp and hash
-    sudo -A apt install nemo-seahorse
-    sudo -A apt install caja-seahorse
-    sudo -A apt install seahorse-nautilus	#for mint 21
-    sudo -A apt install kleopatra
-    sudo -A apt install gtkhash
+    sudo -A apt install nemo-seahorse -y
+    sudo -A apt install caja-seahorse -y
+    sudo -A apt install seahorse-nautilus	-y #for mint 21
+    sudo -A apt install kleopatra -y
+    sudo -A apt install gtkhash -y
 }

 REMOVE(){
--- a/bin/runner.sh
+++ b/bin/runner.sh
@ -56,7 +56,7 @@ echo "@reboot sleep 10 && export DISPLAY=:0 && ${BAPDIR}/bin/.complete" >> $TEMP

 #define core apps
 echo "ARDOP ARDOPGUI AX25 BATT BPQ CHIRP CONKY CQRLOG DIPOLE DIREWOLF EES FLAMP FLDIGI FLMSG FLNET FLRIG FLWRAP GARIM \
-	GPREDICT GPS GPSUPDATE GRIDCALC GRIDTRACKER HAMCLOCK HAMLIB HAMRS HOTSPOT HSTOOLS JS8 M0IAX PAT PATMENU PIAPRS PIQSO PISTATS \
+	GPREDICT GPS GPSUPDATE GRIDCALC GRIDTRACKER HAMCLOCK HAMLIB HAMRS HOTSPOT HSTOOLS JS8 M0IAX PAT PATMENU PATMENU3 PIAPRS PIQSO PISTATS \
 	PITERM QTSOUND REPEAT SECURITY SHOWLOG TQSL VARA VNC WSJTX XASTIR XYGRIB YAAC" > ${BAPDIR}/cache/core.bapps

 	for file in ${CORE}; do
--- a/8
+++ b/8
@ -1,5 +1,9 @@
-version=4.1.5
-
+version=4.1.6
+4.1.6   migrate js8call install to appimage (x86)
+        fix gridtracker links (x86)
+        fix depends SecureFile & SecureText (x86)
+        add pat menu 3 (x86)
+        fix pgp and hash install in security.bapp (x86)
 4.1.5		fix german language issue (PR #147/149)
 4.1.4		add session community bapp
 		add gtkhash to security bapp