From 8e7a6bb08685033cddff20f626896fd269b403b7 Mon Sep 17 00:00:00 2001 From: Joel Scoble Date: Fri, 12 Dec 2014 10:06:35 -0600 Subject: [PATCH] Update format script for new gofmt gofmt no longer supports `tabs` and `tabwidth`, but we still require exactly-4-space tabs to preserve the narrow layout on gobyexample.com, so re-implement this functionality with sed. --- tools/build | 2 +- tools/format | 10 ++++++++++ tools/gofmt | 6 ------ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100755 tools/format delete mode 100755 tools/gofmt diff --git a/tools/build b/tools/build index f23c2d0..829edcb 100755 --- a/tools/build +++ b/tools/build @@ -2,6 +2,6 @@ set -e -tools/gofmt +tools/format tools/measure tools/generate diff --git a/tools/format b/tools/format new file mode 100755 index 0000000..1639e5c --- /dev/null +++ b/tools/format @@ -0,0 +1,10 @@ +#!/bin/bash + +set -eo pipefail + +paths=$(ls tools/*.go examples/*/*.go) + +for path in $paths; do + gofmt -w=true $path + sed -i '' -e 's/ / /g' $path +done diff --git a/tools/gofmt b/tools/gofmt deleted file mode 100755 index c35a228..0000000 --- a/tools/gofmt +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -ls tools/*.go examples/*/*.go | xargs gofmt -tabs=false -tabwidth=4 -w=true