From 3ddad401aa370eca0bf8e2cbdee1becbb7650e02 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 22 Oct 2021 11:14:30 -0500 Subject: [PATCH 1/5] update --- patch/README.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/patch/README.md b/patch/README.md index 34e6beb..9ccd7ef 100644 --- a/patch/README.md +++ b/patch/README.md @@ -6,15 +6,6 @@ Occasionally small changes (patches) are needed for the Build a Pi code. These c # test-patch This patch is for testing purposes only. It will echo "This is a test patch" to the terminal. -# flmsg-20210806 -This patch will install FLMSG 4.0.19 which as of 06AUG2021 will not compile on the Pi with the current Build a Pi code. This patch takes ~20 minutes to complete. +Last Edit 22OCT2021 -# hamlib4.3-20210920 -This patch will install hamlib 4.3 onto your Pi. This patch takes ~20 minutes to complete. https://github.com/km4ack/pi-build/issues/296 - -# flamp-20210912 -This patch will install FLAMP. See this issue https://github.com/km4ack/pi-build/issues/301 for more details. This patch takes ~20 minutes to complete. - -Last Edit 01SEPT2021 - -PATCH=YES \ No newline at end of file +PATCH=NO \ No newline at end of file From 7cbf6d3d68901d55db5dc2ac3ce47780a0df280c Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Oct 2021 18:54:22 -0500 Subject: [PATCH 2/5] fix links --- functions/flsuite.function | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/flsuite.function b/functions/flsuite.function index 441898a..3acec32 100644 --- a/functions/flsuite.function +++ b/functions/flsuite.function @@ -54,7 +54,7 @@ FLSTART() { ################################## FLRIG() { #Determine latest FLRIG - RIGTAR=$(curl -s http://www.w1hkj.com/files/flrig/ | grep .tar.gz | sed 's/
  • \ flrig.*$//' | tail -1) + RIGTAR=$(curl -s http://www.w1hkj.com/files/flrig/ | grep .tar.gz | sed 's/.*ref="//;s/".*$//') RIGPKG=$(echo ${RIGTAR} | sed 's/.tar.gz//') #Download latest FLRIG @@ -77,7 +77,7 @@ FLRIG() { ################################## FLWRAP() { #Determine latest FLWRAP - WRAPTAR=$(curl -s http://www.w1hkj.com/files/flwrap/ | grep .tar.gz | sed 's/
  • \ flwrap.*$//') + WRAPTAR=$(curl -s http://www.w1hkj.com/files/flwrap/ | grep .tar.gz | sed 's/.*ref="//;s/".*$//') WRAPPKG=$(echo ${WRAPTAR} | sed 's/.tar.gz//') #Download latest FLWRAP @@ -120,7 +120,7 @@ FLDIGI() { ################################## FLMSG() { #Determine latest FLMSG - MSGTAR=$(curl -s http://www.w1hkj.com/files/flmsg/ | grep .tar.gz | sed 's/
  • \ flmsg.*$//' | tail -1) + MSGTAR=$(curl -s http://www.w1hkj.com/files/flmsg/ | grep .tar.gz | sed 's/.*ref="//;s/">.*$//') MSGPKG=$(echo ${MSGTAR} | sed 's/.tar.gz//') #download FLMSG @@ -141,7 +141,7 @@ FLMSG() { ################################## FLAMP() { #determine latest FLAMP - AMPTAR=$(curl -s http://www.w1hkj.com/files/flamp/ | grep .tar.gz | sed 's/
  • \ flamp.*$//' | tac | head -1) + AMPTAR=$(curl -s http://www.w1hkj.com/files/flamp/ | grep .tar.gz | tail -1 | sed 's/.*ref="//;s/">.*$//') AMPPKG=$(echo ${AMPTAR} | sed 's/.tar.gz//') #download FLAMP @@ -162,7 +162,7 @@ FLAMP() { ################################## FLNET() { #determine lastest FLNET - NETTAR=$(curl -s http://www.w1hkj.com/files/flnet/ | grep .tar.gz | sed 's/
  • \ flnet.*$//') + NETTAR=$(curl -s http://www.w1hkj.com/files/flnet/ | grep .tar.gz | sed 's/.*ref="//;s/">.*$//') NETPKG=$(echo ${NETTAR} | sed 's/.tar.gz//') #download FLNET From 520bbc87cb0a5fff8cea9f7264bf96770ceb88b9 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Oct 2021 18:55:03 -0500 Subject: [PATCH 3/5] update --- changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index c9fa2dd..0780cb4 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ -version=3.1.1 +version=3.1.2 + +3.1.2 Fix FLSUITE links 3.1.1 Remove echo statement from patch menu script. Add libusb-1.0 and libusb-dev to hamlib build section https://github.com/km4ack/pi-build/issues/296 From 6fb03f42812ba97365dd1461d746f88470d163c4 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Oct 2021 19:20:53 -0500 Subject: [PATCH 4/5] fix link --- functions/flsuite.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/flsuite.function b/functions/flsuite.function index 3acec32..823f526 100644 --- a/functions/flsuite.function +++ b/functions/flsuite.function @@ -33,7 +33,7 @@ FLSTART() { if [ -z "$FLX" ]; then #determine latest FLXMLRPC & download - FLXM=$(curl -s http://www.w1hkj.com/files/flxmlrpc/ | grep .tar.gz | sed 's/
  • \ flxmlrpc.*$//') + FLXM=$(flxmpc - curl -s http://www.w1hkj.com/files/flxmlrpc/ | grep .tar.gz | sed 's/.*ref="//;s/">.*$//') XMPKG=$(echo ${FLXM} | sed 's/.tar.gz//') cd ${HOME}/Downloads || return wget --tries 2 --connect-timeout=60 http://www.w1hkj.com/files/flxmlrpc/${FLXM} From 76b0498c04ba05825a594e59bb33a0d526ee84d5 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Oct 2021 20:43:57 -0500 Subject: [PATCH 5/5] fix link --- functions/flsuite.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/flsuite.function b/functions/flsuite.function index 823f526..90a59ac 100644 --- a/functions/flsuite.function +++ b/functions/flsuite.function @@ -33,7 +33,7 @@ FLSTART() { if [ -z "$FLX" ]; then #determine latest FLXMLRPC & download - FLXM=$(flxmpc - curl -s http://www.w1hkj.com/files/flxmlrpc/ | grep .tar.gz | sed 's/.*ref="//;s/">.*$//') + FLXM=$(curl -s http://www.w1hkj.com/files/flxmlrpc/ | grep .tar.gz | sed 's/.*ref="//;s/">.*$//') XMPKG=$(echo ${FLXM} | sed 's/.tar.gz//') cd ${HOME}/Downloads || return wget --tries 2 --connect-timeout=60 http://www.w1hkj.com/files/flxmlrpc/${FLXM}