From 2594b4e3064610352aaee227e60cf24a66cb5160 Mon Sep 17 00:00:00 2001 From: Chris Bosse Date: Thu, 30 Mar 2023 10:50:08 -0400 Subject: [PATCH 1/2] Fix #21 Call sign lookup with suffixes --- getcall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getcall b/getcall index 7d4f6bc..9dd4232 100644 --- a/getcall +++ b/getcall @@ -55,8 +55,8 @@ yad --width=300 --height=75 --title="Sending" --timeout=2 --timeout-indicator=to FILE=/run/user/$UID/call.txt curl -s -k https://hamcall.net/call?callsign=$CALL1 | grep "" -A 4 -m3 | tail -4 > $FILE -NAME=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk -F "," '{print $1}') -CALL=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk -F "," '{print $2}') +NAME=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk 'sub(", " $NF,x)') +CALL=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk -F ", " '{print $NF}') CITY=$(cat $FILE | head -3 | tail -1 | sed 's/
//') COUN=$(cat $FILE | head -4 | tail -1 | sed 's/
//') From af91302c866d47dcb3d4d777e46ca15dada6e6b8 Mon Sep 17 00:00:00 2001 From: Chris Bosse Date: Thu, 30 Mar 2023 11:16:30 -0400 Subject: [PATCH 2/2] Clean up awk syntax --- getcall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getcall b/getcall index 9dd4232..97b920d 100644 --- a/getcall +++ b/getcall @@ -55,7 +55,7 @@ yad --width=300 --height=75 --title="Sending" --timeout=2 --timeout-indicator=to FILE=/run/user/$UID/call.txt curl -s -k https://hamcall.net/call?callsign=$CALL1 | grep "" -A 4 -m3 | tail -4 > $FILE -NAME=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk 'sub(", " $NF,x)') +NAME=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk 'sub(", " $NF, "")') CALL=$(cat $FILE | head -1 | sed 's///' | sed 's/
//' | awk -F ", " '{print $NF}') CITY=$(cat $FILE | head -3 | tail -1 | sed 's/
//') COUN=$(cat $FILE | head -4 | tail -1 | sed 's/
//')