diff options
| author | Rob Pike <r@golang.org> | 2010-04-06 10:53:48 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2010-04-06 10:53:48 -0700 |
| commit | 23a55e9db34c1e439c2e244c072c003638184c1a (patch) | |
| tree | 95c37277e3b3501b3e460792a1030fcaedb682cf | |
| parent | 722e1e4797b51df8a2062d9f28c03e3836d2f411 (diff) | |
| download | golang-23a55e9db34c1e439c2e244c072c003638184c1a.tar.gz | |
fix deps.bash. \t does not mean tab in some seds.
also: add /dev/null to the ls args to repair handling of empty dependency lists.
R=rsc
CC=golang-dev
http://codereview.appspot.com/883045
| -rwxr-xr-x | src/pkg/deps.bash | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash index 73888dff0..c8406d39c 100755 --- a/src/pkg/deps.bash +++ b/src/pkg/deps.bash @@ -18,10 +18,12 @@ dirpat=$(echo $dirs | sed 's/ /|/g; s/.*/^(&)$/') for dir in $dirs; do ( cd $dir || exit 1 - sources=$(sed -n 's/^[ \t]*\([^ \t]*\.go\)[ \t]*\\*[ \t]*$/\1/p' Makefile) + sources=$(sed -n 's/^[ ]*\([^ ]*\.go\)[ ]*\\*[ ]*$/\1/p' Makefile) sources=$(echo $sources | sed 's/\$(GOOS)/'$GOOS'/g') sources=$(echo $sources | sed 's/\$(GOARCH)/'$GOARCH'/g') - sources=$(ls $sources 2> /dev/null) # remove .s, .c, etc. + # /dev/null here means we get an empty dependency list if $sources is empty + # instead of listing every file in the directory. + sources=$(ls $sources /dev/null 2> /dev/null) # remove .s, .c, etc. deps=$( sed -n '/^import.*"/p; /^import[ \t]*(/,/^)/p' $sources /dev/null | |