free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get prosody nightly source from fbone repo 

This ensures that the install is always consistent
This commit is contained in:
Bob Mottram 2017-01-16 15:38:08 +00:00
parent a8092322e4
commit 703e53ccf9
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

26
src/freedombone-app-xmpp
View File

@ -42,7 +42,7 @@ XMPP_ECC_CURVE='"secp384r1"'
prosody_latest_version='0.10' prosody_latest_version='0.10'
prosody_nightly=333 prosody_nightly=333
prosody_nightly_hash='f1fdc8ce5b6f8bfa451d458616a0bbe5ed7c15881415e561586bab39bd705fa4' prosody_nightly_hash='a104a1b211eeff88247f1b98d7897c96b9d2f76a12b6d738a4c955e569821363'
prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly} prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly}
prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz" 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 make prefix=/usr install
else else
cd $INSTALL_DIR 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 if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then
echo $"Failed to download prosody nightly $prosody_nightly_url" echo $"Failed to download prosody nightly $prosody_nightly_url"
return return
@ -523,7 +532,18 @@ function install_xmpp_nightly {
fi fi
cd $INSTALL_DIR 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 if [ ! -f ${INSTALL_DIR}/${prosody_filename}.tar.gz ]; then
echo $"Failed to download prosody nightly $prosody_nightly_url" echo $"Failed to download prosody nightly $prosody_nightly_url"
exit 78352 exit 78352