diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-06 15:12:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-06 15:12:15 +0000 |
| commit | a13e52d4e8794a4cfcf507b30b779368463ca93d (patch) | |
| tree | 2bbeb60e2197be6385efcdfda83abcd00f3fbec4 | |
| parent | 5992cb86f21722d0d564d3575de82cc5a3963a43 (diff) | |
| parent | a082d38b97bef781c116e0520397f9d049737e0a (diff) | |
| download | kolla-a13e52d4e8794a4cfcf507b30b779368463ca93d.tar.gz kolla-a13e52d4e8794a4cfcf507b30b779368463ca93d.zip | |
Merge "Make tools/min-env.sh portable"
| -rwxr-xr-x | tools/min-env.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/min-env.sh b/tools/min-env.sh index 403a43c34..f5fecec45 100755 --- a/tools/min-env.sh +++ b/tools/min-env.sh @@ -6,6 +6,9 @@ REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") cd "$(dirname "$REAL_PATH")/.." +# Make sure sort produces the same output on all systems +export LC_ALL=C + DOC=docs/minimal-environment-vars.md DOCKERDIR="docker" # BASE and TYPE can be hard coded to centos and rdo since the required vars will always be the same @@ -35,7 +38,7 @@ function find_vars { scripts=$(find ${img_location} -name *.sh | sort -t / -k 4) for script in $scripts; do - local vars=$(awk '/^\s*check_required_vars/,/([^\\]\s*$)/' $script) + local vars=$(awk '/^check_required_vars/,/([^\\] *$)/' $script) vars=$(echo "$vars" | sed 's/check_required_vars//' | sed 's/\\//g') if [ ! -z "$vars" ]; then |