From 7bd487a7eec58bca085090089a7c0b88092206cd Mon Sep 17 00:00:00 2001
From: Mark McGranaghan <mmcgrana@gmail.com>
Date: Sun, 7 Oct 2012 02:13:33 -0400
Subject: [PATCH] update some tool paths

---
 .gitignore                   |  3 --
 tool/build-html              |  3 ++
 tool/{src => }/build-html.go |  0
 tool/compile                 |  7 ----
 tool/measure                 |  3 ++
 tool/{src => }/measure.go    |  0
 tool/src/number.go           | 77 ------------------------------------
 7 files changed, 6 insertions(+), 87 deletions(-)
 create mode 100755 tool/build-html
 rename tool/{src => }/build-html.go (100%)
 delete mode 100755 tool/compile
 create mode 100755 tool/measure
 rename tool/{src => }/measure.go (100%)
 delete mode 100644 tool/src/number.go

diff --git a/.gitignore b/.gitignore
index 8833651..378eac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
 build
-tool/build-html
-tool/number
-tool/measure
diff --git a/tool/build-html b/tool/build-html
new file mode 100755
index 0000000..b8a16e6
--- /dev/null
+++ b/tool/build-html
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec go run tool/build-html.go
diff --git a/tool/src/build-html.go b/tool/build-html.go
similarity index 100%
rename from tool/src/build-html.go
rename to tool/build-html.go
diff --git a/tool/compile b/tool/compile
deleted file mode 100755
index 8a05779..0000000
--- a/tool/compile
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-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/measure b/tool/measure
new file mode 100755
index 0000000..c6c24bc
--- /dev/null
+++ b/tool/measure
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec go run tool/measure.go
diff --git a/tool/src/measure.go b/tool/measure.go
similarity index 100%
rename from tool/src/measure.go
rename to tool/measure.go
diff --git a/tool/src/number.go b/tool/src/number.go
deleted file mode 100644
index 69d463c..0000000
--- a/tool/src/number.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// (Re-)number the book source directories according to the index.
-
-package main
-
-import (
-    "fmt"
-    "io/ioutil"
-    "os"
-    "regexp"
-    "sort"
-    "strings"
-)
-
-func minInt(a, b int) int {
-    if a < b {
-        return a
-    }
-    return b
-}
-
-func main() {
-    // read names of source files
-    sourceNames := make([]string, 0)
-    sourceMap := make(map[string]string)
-    fileInfos, dirErr := ioutil.ReadDir("./src")
-    if dirErr != nil {
-        panic(dirErr)
-    }
-    baseTrimmer, _ := regexp.Compile("^[0-9x]+-")
-    for _, fi := range fileInfos {
-        if fi.Name() != "index.txt" {
-            baseName := baseTrimmer.ReplaceAllString(fi.Name(), "")
-            sourceNames = append(sourceNames, baseName)
-            sourceMap[baseName] = fi.Name()
-        }
-    }
-
-    // read names from index
-    indexBytes, idxErr := ioutil.ReadFile("src/index.txt")
-    if idxErr != nil {
-        panic(idxErr)
-    }
-    indexNamesAll := strings.Split(string(indexBytes), "\n")
-    indexNames := make([]string, 0)
-    for _, indexName := range indexNamesAll {
-        if indexName != "" && !strings.Contains(indexName, "#") && !strings.Contains(indexName, "~") {
-            indexNames = append(indexNames, indexName)
-        }
-    }
-
-    // sanity check two lists
-    if len(sourceNames) != len(indexNames) {
-        sort.Strings(sourceNames)
-        sort.Strings(indexNames)
-        for i := 0; i < minInt(len(sourceNames), len(indexNames)); i++ {
-            fmt.Printf("%s %s\n", sourceNames[i], indexNames[i])
-        }
-        os.Exit(1)
-    }
-    for _, indexName := range indexNames {
-        _, ok := sourceMap[indexName]
-        if !ok {
-            fmt.Printf("%s\n", indexName)
-            os.Exit(1)
-        }
-    }
-
-    // rename some stuff
-    for _, indexName := range indexNames {
-        oldName := sourceMap[indexName]
-        newName := indexName
-        if oldName != newName {
-            fmt.Println(oldName, "->", newName)
-            os.Rename("src/"+oldName, "src/"+newName)
-        }
-    }
-}