Skip to content
This repository was archived by the owner on Jun 21, 2020. It is now read-only.

Commit 0eed8b7

Browse files
km4ackkm4ack
authored
Merge pull request #35 from km4ack/dev
Dev
2 parents 70c0601 + 840af2c commit 0eed8b7

File tree

4 files changed

+196
-31
lines changed

4 files changed

+196
-31
lines changed

‎patmenu-new‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
PS3='Please enter your choice: '
66
source $HOME/patmenu/config
7+
VER=$(cat $HOME/patmenu/release | grep release= | sed 's/release=//')
78
if [ $MYCALLSIGN = "N0CALL" ]
89
then
910
echo "Please see the config file before running Pat Menu"
@@ -86,7 +87,7 @@ FINDARDOP () {
8687

8788
MAINMENU () {
8889
clear;echo;echo;echo
89-
echo "Pat Menu by KM4ACK"
90+
echo "Pat Menu v"$VER" by KM4ACK"
9091
echo
9192
options=("Manage Pat" "Start ARDOP" "Start Packet" "Find Ardop" "Pat Auto Connect" "Pat Catalog" "Stop Modems" "Manage Pat Menu" "Exit")
9293
select opt in "${options[@]}"

‎release‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
This file is used by the update script to check and make sure that the latest version of pat menu is installed on the system.
22

3-
release=0.69
3+
release=0.70
44

55

66
Changelog
77

8+
0.70 add version number to main menu
9+
create backup of start-pat2m #######REMOVE IN FUTURE#######
10+
fix issue 24 https://github.com/km4ack/patmenu/issues/24
11+
bum version #
812
0.69 fix issue 33 https://github.com/km4ack/patmenu/issues/33
913
bump version #
1014
0.68 remove bug warning from README.md

‎start-pat2m‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,48 +84,52 @@ WHO=$(whoami)
8484
fi
8585
SETRIG
8686
fi
87-
87+
#-------------------------------------------------------#
88+
#Old section of code left for reference. km4ack 20200307
89+
#Removed to fix issue 24
90+
#https://github.com/km4ack/patmenu/issues/24
8891
#Buster work around
8992
#check for buster
9093
BUSTER=$(cat /etc/os-release | grep -i buster)
91-
if [ -z "$BUSTER" ]
92-
then
94+
#if [ -z "$BUSTER" ]
95+
#then
9396
#start direwolf
94-
/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
97+
#/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
9598
#disown -a
96-
else
97-
/usr/local/bin/direwolf -p > $TEMP &
98-
sleep 1
99-
sudo killall direwolf
100-
LINK=$(cat $TEMP | grep symlink | awk '{ print $5 }')
101-
rm $TEMP
102-
/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
103-
fi
104-
99+
#else
100+
#/usr/local/bin/direwolf -p > $TEMP &
101+
#sleep 1
102+
#sudo killall direwolf
103+
#LINK=$(cat $TEMP | grep symlink | awk '{ print $5 }')
104+
#rm $TEMP
105105
#/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
106-
#find what pt direwolf created (/dev/pts/X)
107-
#LINK=$(ls -l /tmp/kisstnc | awk '{print $NF}')
106+
#fi
108107

109-
echo "Almost Done"
110-
#give direwolf time to start
111-
sleep 5
112108

113-
if [ -z "$BUSTER" ]
114-
then
109+
#if [ -z "$BUSTER" ]
110+
#then
115111
#start kissattach
116-
$KISS $AXP
117-
sudo kissparms -c 1 -p wl2k
118-
echo;echo;echo
119-
else
112+
#$KISS $AXP
113+
#sudo kissparms -c 1 -p wl2k
114+
#echo;echo;echo
115+
#else
116+
#sudo /usr/sbin/kissattach $LINK $AXP
117+
#sudo kissparms -c 1 -p wl2k
118+
#echo;echo;echo
119+
#fi
120+
#-------------------------------------------------------#
121+
122+
#added to resolve issue 24. km4ack 20200307
123+
/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
124+
echo "Almost Done"
125+
sleep 5
126+
#find what pt direwolf created (/dev/pts/X)
127+
LINK=$(ls -l /tmp/kisstnc | awk '{print $NF}')
128+
#end edit. km4ack 20200307
120129

121130
sudo /usr/sbin/kissattach $LINK $AXP
122131
sudo kissparms -c 1 -p wl2k
123132
echo;echo;echo
124-
fi
125-
126-
#sudo /usr/sbin/kissattach $LINK $AXP
127-
#sudo kissparms -c 1 -p wl2k
128-
#echo;echo;echo
129133

130134
#verify direwolf has started
131135
PIDDW=$(pidof direwolf)

‎start-pat2m.org‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
#!/bin/bash
2+
3+
#script to start Pat for 2m packet work
4+
#20191116 km4ack
5+
6+
clear
7+
8+
source $HOME/patmenu/config
9+
TEMP=$HOME/patmenu/temp
10+
11+
if [ $AMRRON = "no" ] > /dev/null 2>&1
12+
then
13+
14+
#check if piardopc is running
15+
PIDDW=$(pidof piardopc)
16+
if [ -z "$PIDDW" ]
17+
then
18+
echo
19+
else
20+
echo;echo;
21+
echo "It looks like the ARDOP Modem is running"
22+
echo "Stop all modems and try again."
23+
sleep 5
24+
exit 0
25+
fi
26+
27+
fi
28+
29+
echo;echo;
30+
echo "Please standby while direwolf starts"
31+
echo;echo
32+
if [ $AMRRON = "no" ] > /dev/null 2>&1
33+
then
34+
sudo killall direwolf kissattach > /dev/null 2>&1
35+
fi
36+
sleep 1
37+
38+
#Set Mode
39+
RIGFM=$RIG" M $MODE2M 0"
40+
41+
#set the long date
42+
TODAY=$(date)
43+
44+
#set path to my log
45+
MYLOG=$HOME/Documents/mylog.txt
46+
47+
SETRIG () {
48+
49+
#set radio frequency & mode
50+
$RIGFM
51+
52+
sleep 1
53+
54+
#check rig is in correct mode
55+
MODE=$($RIG m | grep $MODE2M)
56+
57+
sleep 1
58+
59+
MODECHECK() {
60+
#check rig is in correct mode
61+
MODE=$($RIG m | grep $MODE2M)
62+
}
63+
64+
sleep 1
65+
66+
if [ -z $MODE ]
67+
then
68+
$RIGFM
69+
MODECHECK
70+
fi
71+
}
72+
73+
74+
#see if rig control is used
75+
if [ $RIGCONTROL == 'yes' ]
76+
then
77+
PIDCTL=$(pidof rigctld)
78+
WHO=$(whoami)
79+
if [ -z "$PIDCTL" ]
80+
then
81+
CONTROL=$(cat $HOME/patmenu/config | grep '^RIG="' | sed 's/RIG="//' | sed 's/"//' | sed 's/rigctl/rigctld/')
82+
$CONTROL &
83+
sudo systemctl restart pat@$WHO
84+
fi
85+
SETRIG
86+
fi
87+
88+
#Buster work around
89+
#check for buster
90+
BUSTER=$(cat /etc/os-release | grep -i buster)
91+
if [ -z "$BUSTER" ]
92+
then
93+
#start direwolf
94+
/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
95+
#disown -a
96+
else
97+
/usr/local/bin/direwolf -p > $TEMP &
98+
sleep 1
99+
sudo killall direwolf
100+
LINK=$(cat $TEMP | grep symlink | awk '{ print $5 }')
101+
rm $TEMP
102+
/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
103+
fi
104+
105+
#/usr/local/bin/$DIREWOLF </dev/null &>/dev/null &
106+
#find what pt direwolf created (/dev/pts/X)
107+
#LINK=$(ls -l /tmp/kisstnc | awk '{print $NF}')
108+
109+
echo "Almost Done"
110+
#give direwolf time to start
111+
sleep 5
112+
113+
if [ -z "$BUSTER" ]
114+
then
115+
#start kissattach
116+
$KISS $AXP
117+
sudo kissparms -c 1 -p wl2k
118+
echo;echo;echo
119+
else
120+
121+
sudo /usr/sbin/kissattach $LINK $AXP
122+
sudo kissparms -c 1 -p wl2k
123+
echo;echo;echo
124+
fi
125+
126+
#sudo /usr/sbin/kissattach $LINK $AXP
127+
#sudo kissparms -c 1 -p wl2k
128+
#echo;echo;echo
129+
130+
#verify direwolf has started
131+
PIDDW=$(pidof direwolf)
132+
if [ -z "$PIDDW" ]
133+
then
134+
echo "Direwolf failed to start"
135+
sleep 5
136+
else
137+
echo "Direwolf has started"
138+
sleep 3
139+
fi
140+
141+
#open pat inbox in browser
142+
export DISPLAY=:0 && chromium-browser --app=http://127.0.0.1:$PORT > /dev/null 2>&1 &
143+
144+
#exit 0
145+
146+
147+
148+
149+
150+
151+
152+
153+
154+
155+
156+

0 commit comments

Comments
 (0)