Browse Source

Only update if necessary

Bob Mottram 9 years ago
parent
commit
60e24314a2
1 changed files with 25 additions and 14 deletions
  1. 25
    14
      src/freedombone-meshweb

+ 25
- 14
src/freedombone-meshweb View File

@@ -16,6 +16,7 @@ ZERONET_PORT=15441
16 16
 TRACKER_PORT=6969
17 17
 MY_USERNAME=$USER
18 18
 ZERONET_DIR=/home/$MY_USERNAME/zeronet
19
+UPDATED="no"
19 20
 
20 21
 function install_zeronet_blog {
21 22
     if [ ! -f /home/$MY_USERNAME/README ]; then
@@ -192,6 +193,11 @@ function install_web_server {
192 193
         return
193 194
     fi
194 195
 
196
+    if [[ $UPDATED == "no" ]]; then
197
+        sudo apt-get update
198
+        UPDATED="yes"
199
+    fi
200
+
195 201
     sudo apt-get -y remove --purge apache2
196 202
     if [ -d /etc/apache2 ]; then
197 203
         sudo rm -rf /etc/apache2
@@ -206,19 +212,25 @@ function install_web_server {
206 212
 }
207 213
 
208 214
 function install_zeronet {
209
-  if [ -d $ZERONET_DIR ]; then
210
-      return
211
-  fi
212
-  sudo apt-get -y install python python-msgpack python-gevent
213
-  sudo apt-get -y install python-pip bittornado
214
-  sudo pip install msgpack-python --upgrade
215
-
216
-  git clone $ZERONET_REPO $ZERONET_DIR
217
-  if [ ! -d $ZERONET_DIR ]; then
218
-      exit 56823
219
-  fi
220
-  cd $ZERONET_DIR
221
-  git checkout bashrc/bootstrap-file
215
+    if [ -d $ZERONET_DIR ]; then
216
+        return
217
+    fi
218
+
219
+    if [[ $UPDATED == "no" ]]; then
220
+        sudo apt-get update
221
+        UPDATED="yes"
222
+    fi
223
+
224
+    sudo apt-get -y install python python-msgpack python-gevent
225
+    sudo apt-get -y install python-pip bittornado
226
+    sudo pip install msgpack-python --upgrade
227
+
228
+    git clone $ZERONET_REPO $ZERONET_DIR
229
+    if [ ! -d $ZERONET_DIR ]; then
230
+        exit 56823
231
+    fi
232
+    cd $ZERONET_DIR
233
+    git checkout bashrc/bootstrap-file
222 234
 }
223 235
 
224 236
 if [ -f /var/lib/batman ]; then
@@ -233,7 +245,6 @@ fi
233 245
 
234 246
 if [[ $SERVER_INSTALLATION == "no" ]]; then
235 247
     if [ ! -f /tmp/meshtype ]; then
236
-        sudo apt-get update
237 248
         install_web_server
238 249
         install_zeronet
239 250
         install_zeronet_blog