From 36eab6a1c3fec99421dc5616dfc32ad1e72bcc15 Mon Sep 17 00:00:00 2001 From: Martin André Date: Wed, 1 Jul 2015 22:19:51 +0900 Subject: Sort variables and remove duplicates for min env doc The script generating docs/minimal-environment-vars.md now sorts variables alphabetically per service and remove duplicates. Update minimal-environment-vars.md. Change-Id: I30cc674b6e9834f2a6c771bd30539a21af39b228 Closes-Bug: #1470504 --- tools/min-env.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'tools') diff --git a/tools/min-env.sh b/tools/min-env.sh index f5fecec45..96f76f316 100755 --- a/tools/min-env.sh +++ b/tools/min-env.sh @@ -34,22 +34,20 @@ function write_env_var { function find_vars { local img_location=$1 - local empty=true - scripts=$(find ${img_location} -name *.sh | sort -t / -k 4) + local all_vars='' + local scripts=$(find ${img_location} -name *.sh | sort -t / -k 4) for script in $scripts; do local vars=$(awk '/^check_required_vars/,/([^\\] *$)/' $script) - vars=$(echo "$vars" | sed 's/check_required_vars//' | sed 's/\\//g') - - if [ ! -z "$vars" ]; then - empty=false - for v in $vars; do - write_env_var $v - done - fi + all_vars="$all_vars $(echo "$vars" | sed 's/check_required_vars//' | sed 's/\\//g')" done - if $empty; then + if [ -n "${all_vars// }" ]; then + all_vars=$(echo "${all_vars[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ') + for v in $all_vars; do + write_env_var $v + done + else echo " None" >> "$DOC" fi } -- cgit v1.2.3