diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-20 21:37:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-20 21:37:50 +0000 |
| commit | 9c1b1058bfdf01a2db2bae8b2cfaf661b513cd36 (patch) | |
| tree | 9f665806c7a0abeee914d0cf58f331853be26566 | |
| parent | 7e24a0e8ae4ca8c861d7c7652bf3342fd243095c (diff) | |
| parent | e21a142111f75ef52df1c7774a4fae808ebe2087 (diff) | |
| download | kolla-9c1b1058bfdf01a2db2bae8b2cfaf661b513cd36.tar.gz kolla-9c1b1058bfdf01a2db2bae8b2cfaf661b513cd36.zip | |
Merge "Make tools bash compatible"
| -rwxr-xr-x | tools/cleanup-images | 2 | ||||
| -rwxr-xr-x | tools/validate-all-dockerfiles.sh | 3 | ||||
| -rwxr-xr-x | tools/validate-all-yaml.sh | 3 | ||||
| -rwxr-xr-x | tools/validate-binary-build.sh | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/tools/cleanup-images b/tools/cleanup-images index 4a5027f07..1e6983f57 100755 --- a/tools/cleanup-images +++ b/tools/cleanup-images @@ -1,7 +1,7 @@ #!/bin/bash # Move to top level directory -REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") +REAL_PATH=$(realpath $0) cd "$(dirname "$REAL_PATH")/.." . tools/validate-docker-execute.sh diff --git a/tools/validate-all-dockerfiles.sh b/tools/validate-all-dockerfiles.sh index 9599208eb..f840c1a8a 100755 --- a/tools/validate-all-dockerfiles.sh +++ b/tools/validate-all-dockerfiles.sh @@ -1,6 +1,7 @@ #!/bin/bash -REAL_PATH=$(python -c "import os,sys;print(os.path.realpath('$0'))") +# Move to top level directory +REAL_PATH=$(realpath $0) cd "$(dirname "$REAL_PATH")/.." RES=0 diff --git a/tools/validate-all-yaml.sh b/tools/validate-all-yaml.sh index 960de9a58..f74a8018d 100755 --- a/tools/validate-all-yaml.sh +++ b/tools/validate-all-yaml.sh @@ -1,6 +1,7 @@ #!/bin/bash -REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") +# Move to top level directory +REAL_PATH=$(realpath $0) cd "$(dirname "$REAL_PATH")/.." find . -name '*.yaml' -o -name '*.yml' -print0 | diff --git a/tools/validate-binary-build.sh b/tools/validate-binary-build.sh index d64f83cac..6b430500b 100755 --- a/tools/validate-binary-build.sh +++ b/tools/validate-binary-build.sh @@ -1,6 +1,7 @@ #!/bin/bash -REAL_PATH=$(python -c "import os,sys;print(os.path.realpath('$0'))") +# Move to top level directory +REAL_PATH=$(realpath $0) cd "$(dirname "$REAL_PATH")/.." RES=0 |