Browse Source

Get prosody nightly source from fbone repo

This ensures that the install is always consistent
Bob Mottram 8 years ago
parent
commit
703e53ccf9
2 changed files with 23 additions and 3 deletions
  1. BIN
      image_build/prosody-0.10-1nightly333.tar.gz
  2. 23
    3
      src/freedombone-app-xmpp

BIN
image_build/prosody-0.10-1nightly333.tar.gz View File


+ 23
- 3
src/freedombone-app-xmpp View File

@@ -42,7 +42,7 @@ XMPP_ECC_CURVE='"secp384r1"'
42 42
 
43 43
 prosody_latest_version='0.10'
44 44
 prosody_nightly=333
45
-prosody_nightly_hash='f1fdc8ce5b6f8bfa451d458616a0bbe5ed7c15881415e561586bab39bd705fa4'
45
+prosody_nightly_hash='a104a1b211eeff88247f1b98d7897c96b9d2f76a12b6d738a4c955e569821363'
46 46
 prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly}
47 47
 prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz"
48 48
 
@@ -179,7 +179,16 @@ function upgrade_xmpp_server {
179 179
         make prefix=/usr install
180 180
     else
181 181
         cd $INSTALL_DIR
182
-        wget $prosody_nightly_url
182
+        # Try to get the source from the project repo
183
+        if [ -f /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then
184
+            cp /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz .
185
+        else
186
+            if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then
187
+                cp /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz .
188
+            else
189
+                wget $prosody_nightly_url
190
+            fi
191
+        fi
183 192
         if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then
184 193
             echo $"Failed to download prosody nightly $prosody_nightly_url"
185 194
             return
@@ -523,7 +532,18 @@ function install_xmpp_nightly {
523 532
     fi
524 533
 
525 534
     cd $INSTALL_DIR
526
-    wget $prosody_nightly_url
535
+
536
+    # Try to get the source from the project repo
537
+    if [ -f /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then
538
+        cp /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz .
539
+    else
540
+        if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then
541
+            cp /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz .
542
+        else
543
+            wget $prosody_nightly_url
544
+        fi
545
+    fi
546
+
527 547
     if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then
528 548
         echo $"Failed to download prosody nightly $prosody_nightly_url"
529 549
         exit 78352