diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh
index d17080c..cc42dec 100755
--- a/AmRRON-Setup-Script.sh
+++ b/AmRRON-Setup-Script.sh
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
-######################## AmRRON Setup Script v1.2.3 ########################
+######################## AmRRON Setup Script v1.2.4 ########################
######################## Created by TB-14 ########################
-######################## 24 JUN 2025 ########################
+######################## 26 JUN 2025 ########################
################################################################################
################################################################################
#
@@ -469,8 +469,13 @@ fi
echo "10% Complete"
-NEWFLMSG=$(curl -s https://www.w1hkj.org/files/flmsg/ | grep -Eo flmsg-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \
- sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}')
+#NEWFLMSG=$(curl -s https://www.w1hkj.org/files/flmsg/ | grep -Eo flmsg-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \
+# sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}')
+NEWFLMSG=$(curl -s https://www.w1hkj.org/files/flmsg/ | \
+ grep -Eo 'flmsg-[0-9]+(\.[0-9]+)+\.tar\.gz' | \
+ sort -V | tail -n 1 | \
+ sed -E 's/flmsg-([0-9.]+)\.tar\.gz/\1/')
+
if [[ $NEWFLMSG == "" ]]; then
NEWFLMSG="SERVER DOWN"
fi
@@ -590,7 +595,8 @@ fi
#NEWWSJTX=$(curl -sL https://sourceforge.net/projects/wsjt/files | grep "released" | awk -F "title=" '{print $2}' | awk -F "/" '{print $2}' | awk -F "wsjtx-" '{print $2}')
NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Candidate release" | awk -F "WSJT-X " '{print $2}' | awk -F "" '{print $1}')
NEWWSJTX_STABLE=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Latest General Availability (GA) releases" | awk -F "WSJT-X " '{print $2}' | awk -F " " '{print $1}')
-NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//')
+#NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//')
+NEWJS8CALLVER=$(curl -s https://api.github.com/repos/js8call/js8call/releases/latest | grep '"tag_name"' | sed -E 's/.*"v?([^"]+)".*/\1/')
echo "100% Complete"
@@ -1976,36 +1982,36 @@ if [[ $NEWJS8CALLVER == "SERVER DOWN" ]]; then
return
fi
+NEWJS8CALLURL=$(curl -s https://api.github.com/repos/js8call/js8call/releases/latest | grep "browser_download_url" | grep ".deb" | cut -d '"' -f 4)
+JS8CALL_DEB_NAME=$(basename "$NEWJS8CALLURL")
+
if [[ ${JS8CALLVER} == ${NEWJS8CALLVER} ]]; then
echo "JS8Call is already at the most current version"
- elif [[ ${JS8CALLVER} == "2.2.1-devel" ]] && [[ ${NEWJS8CALLVER} == "2.2.0" ]]; then
- echo "JS8Call is already at the most current version"
-
- else
-
- sudo apt-get install -y build-essential gfortran autoconf automake libtool cmake git asciidoctor libfftw3-dev qtdeclarative5-dev texinfo libqt5multimedia5 libqt5multimedia5-plugins qtmultimedia5-dev libusb-1.0.0-dev libqt5serialport5-dev asciidoc libudev-dev
-
- JS8PKG=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//')
- JS8VERSION=$(echo $JS8PKG | sed 's/js8call-//;s/.tgz.*$//')
+else
- wget -P $USERDIR/ -N http://files.js8call.com/$JS8VERSION/$JS8PKG ||
- { ERRCODE="Failed to download JS8Call"; errors; return; }
+wget -P ~/Downloads -N $NEWJS8CALLURL ||
+{ ERRCODE="Failed to download JS8Call"; errors; return; }
- cd $USERDIR && tar -xvf $USERDIR/$JS8PKG && rm $USERDIR/$JS8PKG ||
- { ERRCODE="Unable to extract JS8call Source Code"; errors; return; }
+if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then
+ echo "JS8Call 2.2.1-devel currently installed. Removing 2.2.1-devel"
+ cd ~/Radio/js8call && sudo make uninstall && cd $USERDIR ||
+ { ERRCODE="Failed to uninstall JS8Call 2.2.1-devel"; errors; return; }
+fi
- cd $USERDIR/js8call
+if hash js8call 2>/dev/null; then
+sudo apt uninstall js8call -y ||
+{ ERRCODE="Failed to uninstall JS8Call"; errors; return; }
- cmake . && cmake --build . -- -j4 && sudo make install ||
- { ERRCODE="Failed to build JS8Call."; errors; return; }
+fi
+cd ~/Downloads && sudo apt install ./$JS8CALL_DEB_NAME ||
+{ ERRCODE="Failed to install $JS8CALL_DEB_NAME"; errors; return; }
+
+rm ~/Downloads/$JS8CALL_DEB_NAME ||
+{ ERRCODE="Failed to delete js8call deb file from Downloads directory"; errors; return; }
-#Cleanup space from compiling
-#if hash js8call 2>/dev/null; then
-# sudo rm -r $USERDIR/js8call
-#fi
fi
}
diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh
index fef0e91..eaf7a07 100755
--- a/AmRRON-Vara-setup.sh
+++ b/AmRRON-Vara-setup.sh
@@ -472,7 +472,7 @@ WINEPREFIX="${WINEPREFIX:-$HOME/.wine}"
fi
-cd $HOME/setup-scripts/Files/ && wine VarAC_Installer_V11_0_7.exe ||
+cd $HOME/setup-scripts/Files/ && wine VarAC_Installer_V11_4_0.exe ||
{ ERRCODE="Failed to install VarAC"; errors; return; }
else
@@ -645,7 +645,7 @@ rc=$?
if [[ $rc -eq 2 ]]; then
sudo shutdown -r now
elif [[ $rc -eq 1 ]]; then
-echo "Good luck and 73's. If you have any issues or suggestions please contact tb14@protonmail.com or submit a merge request on gitlab." | yad --image=$DIR/images/corps-icon.png \
+echo "Good luck and 73's. If you have any issues or suggestions please contact tangobravo14@protonmail.com or submit a merge request on gitlab." | yad --image=$DIR/images/corps-icon.png \
--text-info --wrap \
--center --button="gtk-ok:0" \
--title "Thank you." ${r} ${c}
diff --git a/Files/VarAC_Installer_V11_0_7.exe b/Files/VarAC_Installer_V11_4_0.exe
similarity index 53%
rename from Files/VarAC_Installer_V11_0_7.exe
rename to Files/VarAC_Installer_V11_4_0.exe
index 8f22621..b514865 100644
Binary files a/Files/VarAC_Installer_V11_0_7.exe and b/Files/VarAC_Installer_V11_4_0.exe differ
diff --git a/Files/AmRRON Actual (ECC)_0x50612239_public.asc b/Files/pgp-keys/AmRRON Actual (ECC)_0x50612239_public.asc
similarity index 100%
rename from Files/AmRRON Actual (ECC)_0x50612239_public.asc
rename to Files/pgp-keys/AmRRON Actual (ECC)_0x50612239_public.asc
diff --git a/Files/pgp-keys/GA-SC-Eastern_Actual.asc b/Files/pgp-keys/GA-SC-Eastern_Actual.asc
new file mode 100644
index 0000000..0ecd6c4
--- /dev/null
+++ b/Files/pgp-keys/GA-SC-Eastern_Actual.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaFSsdxYJKwYBBAHaRw8BAQdA1jo4EbDPmNzReia2GMKEMa6rYfxc4PdOIRIY
+QE9HMvm0FEdBLVNDIEVhc3Rlcm5fQWN0dWFsiJAEExYIADgWIQT1CBVVLgjBZ6He
+Q42kKBTUeUrjcwUCaFSsdwIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCk
+KBTUeUrjc4EDAQDhjEKKB5CxEHZwpXOMNcQ0nagElYHJNwVKFsqlw94D4AD6Amdj
+zgrgglyzCDcw31BPpD++HwGX1T2BrEqKoYKvIAG4OARoVKx3EgorBgEEAZdVAQUB
+AQdAv9/4b3TUClVHezvCcjjbxhSi4NeXvd5GWAbIXQhA9nsDAQgHiHgEGBYIACAW
+IQT1CBVVLgjBZ6HeQ42kKBTUeUrjcwUCaFSsdwIbDAAKCRCkKBTUeUrjc7uaAP0a
+ZTSuNCPLr3j5pP/1Qv0u4OCs2FILnpVrZOMyoN3NAAD9HOot0q+iQnNs5U9pIrLD
+XI9AXzKgvALcIMcgmSWWPwg=
+=PNyM
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/Files/pgp-keys/Western_Actual_0xF3511842_public.asc b/Files/pgp-keys/Western_Actual_0xF3511842_public.asc
new file mode 100644
index 0000000..927c370
--- /dev/null
+++ b/Files/pgp-keys/Western_Actual_0xF3511842_public.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaFNeOxYJKwYBBAHaRw8BAQdA3FMo4q7tH+r8Ve1YpWsiSDY0W52XT8e1fE5D
+T/amL2K0I1dlc3Rlcm5fQWN0dWFsIDxXZXN0ZXJuQGFjdHVhbC5uZXQ+iJkEExYK
+AEEWIQR0a0zK3ZG8VrE8vuw74nLa81EYQgUCaFNeOwIbAwUJA8IVdQULCQgHAgIi
+AgYVCgkICwIEFgIDAQIeBwIXgAAKCRA74nLa81EYQsZhAP9KSebDblAqGsJdTIHg
+2mFlpIbDYPcMif4P2VFiCCz/sQEA1r2R/XA+rChsn3nP5wtqFSkMzVHSOXhmzaZt
+QvMcwA24OARoU147EgorBgEEAZdVAQUBAQdAe+wIR8j09XOw7sRG20T+VVNqULpr
+9TJ8+BHsTQsXklMDAQgHiH4EGBYKACYWIQR0a0zK3ZG8VrE8vuw74nLa81EYQgUC
+aFNeOwIbDAUJA8IVdQAKCRA74nLa81EYQgCCAP9TptIekxdkeMgDXFr8n4uI8wPX
+lAy/Pe6JL4m655r63gD9EJKvQ651eQCxVJBtcyXslZujPApFGVEvA4isiEnqKgs=
+=vlA0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md
index 7d26d94..7538351 100644
--- a/changelogs/CHANGELOG-Setup-Script.md
+++ b/changelogs/CHANGELOG-Setup-Script.md
@@ -1,3 +1,5 @@
+# Version 1.2.4
+- Fixed JS8Call to pull 2.3.0. 2.2.0 is still default easy button until 2.3.0 is tested and post TREX.
# Version 1.2.3
- Added JS8Call 2.2.0 as default.
# Version 1.2.2