Merge pull request #1284 from nicolasnoble/bashisms

Removing some bashisms.
pull/1285/head^2
Craig Tiller 10 years ago
commit 999db71269
  1. 8
      tools/buildgen/generate_projects.sh

@ -46,13 +46,11 @@ end2end_test_build=`mktemp /tmp/genXXXXXX`
$gen_build_json > $end2end_test_build $gen_build_json > $end2end_test_build
global_plugins=`find ./tools/buildgen/plugins -name '*.py' | global_plugins=`find ./tools/buildgen/plugins -name '*.py' |
sort | grep -v __init__ | sort | grep -v __init__ | awk ' { printf "-p %s ", $0 } '`
while read p ; do echo -n "-p $p " ; done`
for dir in . ; do for dir in . ; do
local_plugins=`find $dir/templates -name '*.py' | local_plugins=`find $dir/templates -name '*.py' |
sort | grep -v __init__ | sort | grep -v __init__ | awk ' { printf "-p %s ", $0 } '`
while read p ; do echo -n "-p $p " ; done`
plugins="$global_plugins $local_plugins" plugins="$global_plugins $local_plugins"
@ -60,7 +58,7 @@ for dir in . ; do
out=${dir}/${file#$dir/templates/} # strip templates dir prefix out=${dir}/${file#$dir/templates/} # strip templates dir prefix
out=${out%.*} # strip template extension out=${out%.*} # strip template extension
json_files="build.json $end2end_test_build" json_files="build.json $end2end_test_build"
data=`for i in $json_files; do echo -n "-d $i "; done` data=`for i in $json_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '`
if [ "x$TEST" = "xtrue" ] ; then if [ "x$TEST" = "xtrue" ] ; then
actual_out=$out actual_out=$out
out=`mktemp /tmp/gentXXXXXX` out=`mktemp /tmp/gentXXXXXX`

Loading…
Cancel
Save