mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-19 03:26:15 +08:00
Fix shellcheck complaints about provisioning scripts
Also adds executable attributes to shell scripts that were missing it. Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
@@ -7,16 +7,16 @@ set -ex
|
||||
TestMachine='qt-test-server'
|
||||
|
||||
# Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist
|
||||
if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ]
|
||||
if [ -z "$(docker-machine ls -q --filter "name=$TestMachine")" ]
|
||||
then
|
||||
docker-machine create $@ $TestMachine
|
||||
docker-machine ip $TestMachine
|
||||
docker-machine create "$@" "$TestMachine"
|
||||
docker-machine ip "$TestMachine"
|
||||
else
|
||||
# Otherwise, start the docker machine and update with new TLS certificates.
|
||||
docker-machine start $TestMachine && docker-machine regenerate-certs -f $TestMachine
|
||||
docker-machine start "$TestMachine" && docker-machine regenerate-certs -f "$TestMachine"
|
||||
fi
|
||||
|
||||
# Switch the docker engine to $TestMachine
|
||||
eval $(docker-machine env $TestMachine)
|
||||
eval "$(docker-machine env "$TestMachine")"
|
||||
|
||||
docker-machine ls
|
||||
|
||||
Reference in New Issue
Block a user