diff --git a/changelog b/changelog index a560ea6..2eb11c5 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,8 @@ -release=2.11.0 +release=2.11.1 Changelog +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 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=$? diff --git a/start-vara-fm b/start-vara-fm index 72e7606..bd020fb 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 \ @@ -108,10 +108,10 @@ 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) +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 cff0566..47f74fa 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 \ @@ -109,10 +109,10 @@ 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) +PIDVARA=$(ps aux | grep -i .wine | grep -i vara) if [ -z "$PIDVARA" ] then yad --title="FAILED" --width=400 --height=100 \