From 6b08549ceae93ec0f1900db5a5899c72191d8d67 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 21 Oct 2022 12:57:24 -0700 Subject: [PATCH 1/5] correct modem detection --- start-vara-fm | 2 +- start-vara-hf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/start-vara-fm b/start-vara-fm index 72e7606..5701256 100755 --- a/start-vara-fm +++ b/start-vara-fm @@ -32,7 +32,7 @@ FLRIG=$(echo $RIG | grep "\-m 4") fi #Check if modem is already running -MODEMCHECK=$(ps aux | grep -i box86 | grep -i varafm) +MODEMCHECK=$(ps aux | grep -i .wine | grep -i varafm) if [ ! -z "$MODEMCHECK" ]; then yad --title="FAILED" --width=400 --height=100 \ --image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \ diff --git a/start-vara-hf b/start-vara-hf index cff0566..374ce80 100755 --- a/start-vara-hf +++ b/start-vara-hf @@ -33,7 +33,7 @@ FLRIG=$(echo $RIG | grep "\-m 4") fi #Check if modem is already running -MODEMCHECK=$(ps aux | grep -i box86 | grep -i varafm) +MODEMCHECK=$(ps aux | grep -i .wine | grep -i vara) if [ ! -z "$MODEMCHECK" ]; then yad --title="FAILED" --width=400 --height=100 \ --image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \ From 734bb351ced5f860cc1057baa00fcfa10bd001fe Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 21 Oct 2022 13:03:15 -0700 Subject: [PATCH 2/5] timeout to 10second --- start-vara-fm | 2 +- start-vara-hf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/start-vara-fm b/start-vara-fm index 5701256..dff9e83 100755 --- a/start-vara-fm +++ b/start-vara-fm @@ -108,7 +108,7 @@ fi echo "starting VARA-FM" /usr/local/bin/wine $HOME/.wine/drive_c/VARA\ FM/VARAFM.exe > /dev/null 2>&1 & -sleep 7 #give vara time to start +sleep 10 #give vara time to start #verify vara has started PIDVARA=$(ps aux | grep -i box86 | grep -i varafm) diff --git a/start-vara-hf b/start-vara-hf index 374ce80..808659a 100755 --- a/start-vara-hf +++ b/start-vara-hf @@ -109,7 +109,7 @@ fi echo "starting VARA HF" /usr/local/bin/wine $HOME/.wine/drive_c/VARA/VARA.exe > /dev/null 2>&1 & -sleep 7 #give vara time to start +sleep 10 #give vara time to start #verify vara has started PIDVARA=$(ps aux | grep -i box86 | grep VARA.exe) From e85cda185b0137eceadcc9fd27a377355ad9b66b Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 21 Oct 2022 13:10:26 -0700 Subject: [PATCH 3/5] correct detection --- start-vara-fm | 2 +- start-vara-hf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/start-vara-fm b/start-vara-fm index dff9e83..bd020fb 100755 --- a/start-vara-fm +++ b/start-vara-fm @@ -111,7 +111,7 @@ echo "starting VARA-FM" sleep 10 #give vara time to start #verify vara has started -PIDVARA=$(ps aux | grep -i box86 | grep -i varafm) +PIDVARA=$(ps aux | grep -i .wine | grep -i varafm) if [ -z "$PIDVARA" ] then yad --title="FAILED" --width=400 --height=100 \ diff --git a/start-vara-hf b/start-vara-hf index 808659a..47f74fa 100755 --- a/start-vara-hf +++ b/start-vara-hf @@ -112,7 +112,7 @@ echo "starting VARA HF" sleep 10 #give vara time to start #verify vara has started -PIDVARA=$(ps aux | grep -i box86 | grep VARA.exe) +PIDVARA=$(ps aux | grep -i .wine | grep -i vara) if [ -z "$PIDVARA" ] then yad --title="FAILED" --width=400 --height=100 \ From 3166f4e1f1a8c3e09cd98a2b9edf4de817a423e4 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 21 Oct 2022 13:13:05 -0700 Subject: [PATCH 4/5] cleanup for 2.10.1 --- changelog | 4 +++- modems | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 447dc20..71faead 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,8 @@ -release=2.10.0 +release=2.10.1 Changelog +2.10.1 take VARA out of BETA status + fix VARA modem start and stop detection 2.10.0 add VARA to getardoplist script add VARA to getardoplist-cron script add Pat Autoconnect VARA script diff --git a/modems b/modems index 4b578ff..7a19bfc 100755 --- a/modems +++ b/modems @@ -21,8 +21,8 @@ yad --form --width=420 --text-align=center --center --title="Pat Menu" --text-al --field="Start Packet Modem":fbtn 'bash -c "$MYPATH/start-pat2m"' \ --field="Start Mobilinkd Modem Bluetooth":fbtn 'bash -c "$MYPATH/mobilink"' \ --field="Start Mobilinkd Modem Wired":fbtn 'bash -c "$MYPATH/mobi-wired"' \ ---field="Start VARA Modem (BETA)":fbtn 'bash -c "$MYPATH/start-vara-hf"' \ ---field="Start VARA FM Modem (BETA)":fbtn 'bash -c "$MYPATH/start-vara-fm"' \ +--field="Start VARA Modem":fbtn 'bash -c "$MYPATH/start-vara-hf"' \ +--field="Start VARA FM Modem":fbtn 'bash -c "$MYPATH/start-vara-fm"' \ --field="Stop Modems":fbtn 'bash -c "$MYPATH/stop-modems"' \ --button="Main Menu":1 BUT=$? From e7734db0613deb61752a6187ed85f8415a6d572f Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 21 Oct 2022 13:22:47 -0700 Subject: [PATCH 5/5] fix merge from lastnight --- changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 71faead..2eb11c5 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,9 @@ -release=2.10.1 +release=2.11.1 Changelog -2.10.1 take VARA out of BETA status +2.11.1 take VARA out of BETA status fix VARA modem start and stop detection +2.11.0 add auto start modem 2.10.0 add VARA to getardoplist script add VARA to getardoplist-cron script add Pat Autoconnect VARA script