diff --git a/image_build/prosody-0.10-1nightly333.tar.gz b/image_build/prosody-0.10-1nightly333.tar.gz new file mode 100644 index 00000000..f9135936 Binary files /dev/null and b/image_build/prosody-0.10-1nightly333.tar.gz differ diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 44a981f9..a966c8c7 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -42,7 +42,7 @@ XMPP_ECC_CURVE='"secp384r1"' prosody_latest_version='0.10' prosody_nightly=333 -prosody_nightly_hash='f1fdc8ce5b6f8bfa451d458616a0bbe5ed7c15881415e561586bab39bd705fa4' +prosody_nightly_hash='a104a1b211eeff88247f1b98d7897c96b9d2f76a12b6d738a4c955e569821363' prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly} prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz" @@ -179,7 +179,16 @@ function upgrade_xmpp_server { make prefix=/usr install else cd $INSTALL_DIR - wget $prosody_nightly_url + # Try to get the source from the project repo + if [ -f /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then + cp /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz . + else + if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz . + else + wget $prosody_nightly_url + fi + fi if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then echo $"Failed to download prosody nightly $prosody_nightly_url" return @@ -523,7 +532,18 @@ function install_xmpp_nightly { fi cd $INSTALL_DIR - wget $prosody_nightly_url + + # Try to get the source from the project repo + if [ -f /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then + cp /root/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz . + else + if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz ]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/image_build/${prosody_filename}.tar.gz . + else + wget $prosody_nightly_url + fi + fi + if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then echo $"Failed to download prosody nightly $prosody_nightly_url" exit 78352