Browse Source

Skip package installs if in mesh mode

Bob Mottram 9 years ago
parent
commit
4c40c05ba6
2 changed files with 17 additions and 10 deletions
  1. 12
    8
      src/freedombone-client
  2. 5
    2
      src/freedombone-mesh

+ 12
- 8
src/freedombone-client View File

@@ -104,9 +104,11 @@ function configure_ssh_client {
104 104
 }
105 105
 
106 106
 function mesh_babel {
107
-  sudo apt-get -y install babeld
108
-  sudo apt-get -y install irssi mumble
109
-  sudo apt-get -y install toxic
107
+  if [ ! -f /tmp/meshtype ]; then
108
+      sudo apt-get -y install babeld
109
+      sudo apt-get -y install irssi mumble
110
+      sudo apt-get -y install toxic
111
+  fi
110 112
 
111 113
   babel_script=/tmp/babel
112 114
 
@@ -188,11 +190,13 @@ function mesh_babel {
188 190
 }
189 191
 
190 192
 function mesh_batman {
191
-  sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
192
-  sudo apt-get -y install python-dev libevent-dev ebtables python-pip
193
-  sudo apt-get -y install wireless-tools rfkill
194
-  sudo apt-get -y install irssi mumble
195
-  sudo apt-get -y install toxic
193
+  if [ ! -f /tmp/meshtype ]; then
194
+      sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
195
+      sudo apt-get -y install python-dev libevent-dev ebtables python-pip
196
+      sudo apt-get -y install wireless-tools rfkill
197
+      sudo apt-get -y install irssi mumble
198
+      sudo apt-get -y install toxic
199
+  fi
196 200
 
197 201
   batman_script=/tmp/batman
198 202
 

+ 5
- 2
src/freedombone-mesh View File

@@ -146,13 +146,15 @@ if [ ! -f $MUMBLE_PATH ]; then
146 146
                     sudo cp $DHTNODES $DHTNODES.internet
147 147
                 fi
148 148
             fi
149
-            sudo lstox -f dht > $DHTNODES
149
+            lstox -f dht > /tmp/dht
150
+			sudo cp /tmp/dht $DHTNODES
150 151
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
151 152
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
152 153
                 echo "/add $PEER_TOX_ID
153 154
 " | $TOXIC_PATH -d
154 155
                 exit 0
155 156
             else
157
+				echo $PEER_TOX_ID
156 158
                 echo "Tox ID for $AVAHI_DOMAIN was not found"
157 159
                 exit 6
158 160
             fi
@@ -204,7 +206,8 @@ else
204 206
                     sudo cp $DHTNODES $DHTNODES.internet
205 207
                 fi
206 208
             fi
207
-            sudo lstox -f dht > $DHTNODES
209
+            lstox -f dht > /tmp/dht
210
+			sudo cp /tmp/dht $DHTNODES
208 211
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
209 212
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
210 213
                 echo "/add $PEER_TOX_ID