diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:36:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:37:28 +0100 |
| commit | 25a0f1fa08fcb127ec138f0f457feaad53c27534 (patch) | |
| tree | 7fdf319d8e531b0932687e99a9e7e904b8c48f9a /coin/provisioning/common/unix/mqtt_broker.sh | |
| parent | 532f1dea57210970cb8449fbb94f46e356706163 (diff) | |
| parent | 9a160d28d57605db98353740523d086ea5c5446d (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
Diffstat (limited to 'coin/provisioning/common/unix/mqtt_broker.sh')
| -rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index c2fb2e30..c64c0fec 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -37,10 +37,11 @@ # shellcheck source=./InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" -PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" SHA1="532fe145096cdd8d679f425cbfd883289150c968" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" @@ -49,4 +50,6 @@ sudo rm -fr "$targetFolder" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding MQTT broker path to environment" -sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc +SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py" + +echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt |