浏览代码

Skip package installs if in mesh mode

Bob Mottram 9 年前
父节点
当前提交
4c40c05ba6
共有 2 个文件被更改,包括 17 次插入10 次删除
  1. 12
    8
      src/freedombone-client
  2. 5
    2
      src/freedombone-mesh

+ 12
- 8
src/freedombone-client 查看文件

104
 }
104
 }
105
 
105
 
106
 function mesh_babel {
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
   babel_script=/tmp/babel
113
   babel_script=/tmp/babel
112
 
114
 
188
 }
190
 }
189
 
191
 
190
 function mesh_batman {
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
   batman_script=/tmp/batman
201
   batman_script=/tmp/batman
198
 
202
 

+ 5
- 2
src/freedombone-mesh 查看文件

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