From f38b70f83346d06b401d18862c111380d997df4b Mon Sep 17 00:00:00 2001 From: Mark McGranaghan Date: Mon, 1 Oct 2012 19:17:05 -0700 Subject: [PATCH] inline build-html glob --- .gitignore | 3 +-- tool/build-html | 6 ------ tool/compile | 2 +- tool/src/{build-html-inner.go => build-html.go} | 11 +++++------ 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100755 tool/build-html rename tool/src/{build-html-inner.go => build-html.go} (96%) diff --git a/.gitignore b/.gitignore index 8f23fa2..8833651 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ build -tool/build-html-inner +tool/build-html tool/number tool/measure - diff --git a/tool/build-html b/tool/build-html deleted file mode 100755 index 825e9dc..0000000 --- a/tool/build-html +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -ls src/0*/*.{go,sh} | xargs tool/build-html-inner > build/go-by-example.html diff --git a/tool/compile b/tool/compile index 37288bc..8a05779 100755 --- a/tool/compile +++ b/tool/compile @@ -2,6 +2,6 @@ set -e -go build -o tool/build-html-inner tool/src/build-html-inner.go +go build -o tool/build-html tool/src/build-html.go go build -o tool/number tool/src/number.go go build -o tool/measure tool/src/measure.go diff --git a/tool/src/build-html-inner.go b/tool/src/build-html.go similarity index 96% rename from tool/src/build-html-inner.go rename to tool/src/build-html.go index 2ff93ac..8f0fe17 100644 --- a/tool/src/build-html-inner.go +++ b/tool/src/build-html.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "os" "os/exec" + "path/filepath" "regexp" "strings" ) @@ -88,13 +89,11 @@ type seg struct { } func main() { - if len(os.Args) <= 1 { - fmt.Fprintln(os.Stderr, "usage: tool/build-html-inner *.{go,sh} > output.html") - os.Exit(1) - } - ensureCache() + sourcePaths, err := filepath.Glob("./src/0*/*") + check(err) + fmt.Print(` @@ -107,7 +106,7 @@ func main() { `) - for _, sourcePath := range os.Args[1:] { + for _, sourcePath := range sourcePaths { lexer := whichLexer(sourcePath) lines := readLines(sourcePath)