all: revert switch to a Go module in master

We'll keep the addition of the module files and the change of import paths in a separate module branch. Fixes #267.
mvdan · Jul 20, 2018 · 1831d69 · 1831d69
1 parent 9d6ee0f
commit 1831d69
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,15 +3,12 @@ language: go
 matrix:
   include:
     - os: linux
-      dist: trusty
-      sudo: false
       go: 1.9.x
     - os: linux
-      dist: trusty
-      sudo: false
       go: 1.10.x
+    - os: linux
+      go: "1.10"
     - os: osx
-      osx_image: xcode9.2
       go: 1.10.x
 
 go_import_path: mvdan.cc/sh

diff --git a/README.md b/README.md
@@ -6,9 +6,8 @@
 [![Coverage Status](https://coveralls.io/repos/github/mvdan/sh/badge.svg?branch=master)](https://coveralls.io/github/mvdan/sh)
 
 A shell parser, formatter and interpreter. Supports [POSIX Shell], [Bash] and
-[mksh]. Requires Go 1.9 or later with [minimal support for Go
-modules](https://github.com/golang/go/issues/25069), such as Go 1.9.7 or Go
-1.10.3.
+[mksh]. Requires Go 1.9 or later. A Go module is available via the `module`
+branch.
 
 ### shfmt
 

diff --git a/_js/main.go b/_js/main.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gopherjs/gopherjs/js"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func main() {

diff --git a/cmd/gosh/main.go b/cmd/gosh/main.go
@@ -12,8 +12,8 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"mvdan.cc/sh/v2/interp"
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/interp"
+	"mvdan.cc/sh/syntax"
 )
 
 var (

diff --git a/cmd/shfmt/json.go b/cmd/shfmt/json.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"reflect"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func writeJSON(w io.Writer, f *syntax.File, pretty bool) error {

diff --git a/cmd/shfmt/json_test.go b/cmd/shfmt/json_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 var jsonTests = []struct {

diff --git a/cmd/shfmt/main.go b/cmd/shfmt/main.go
@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"mvdan.cc/sh/v2/fileutil"
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/fileutil"
+	"mvdan.cc/sh/syntax"
 )
 
 var (

diff --git a/cmd/shfmt/main_test.go b/cmd/shfmt/main_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func TestMain(m *testing.M) {

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/interp/arith.go b/interp/arith.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func (r *Runner) arithm(expr syntax.ArithmExpr) int {

diff --git a/interp/builtin.go b/interp/builtin.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func isBuiltin(name string) bool {

diff --git a/interp/expand.go b/interp/expand.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func (r *Runner) expandFormat(format string, args []string) (int, string, error) {

diff --git a/interp/interp.go b/interp/interp.go
@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 // A Runner interprets shell programs. It cannot be reused once a

diff --git a/interp/interp_test.go b/interp/interp_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func BenchmarkRun(b *testing.B) {

diff --git a/interp/module_test.go b/interp/module_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 var modCases = []struct {

diff --git a/interp/param.go b/interp/param.go
@@ -13,7 +13,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func anyOfLit(v interface{}, vals ...string) string {

diff --git a/interp/test.go b/interp/test.go
@@ -11,7 +11,7 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 // non-empty string is true, empty string is false

diff --git a/interp/test_classic.go b/interp/test_classic.go
@@ -6,7 +6,7 @@ package interp
 import (
 	"fmt"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 const illegalTok = 0

diff --git a/interp/vars.go b/interp/vars.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 type Environ interface {

diff --git a/shell/expand.go b/shell/expand.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"strings"
 
-	"mvdan.cc/sh/v2/interp"
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/interp"
+	"mvdan.cc/sh/syntax"
 )
 
 // Expand performs shell expansion on s, using env to resolve variables.

diff --git a/shell/source.go b/shell/source.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"time"
 
-	"mvdan.cc/sh/v2/interp"
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/interp"
+	"mvdan.cc/sh/syntax"
 )
 
 // SourceFile sources a shell file from disk and returns the variables

diff --git a/shell/source_test.go b/shell/source_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"mvdan.cc/sh/v2/interp"
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/interp"
+	"mvdan.cc/sh/syntax"
 
 	"github.com/kr/pretty"
 )

diff --git a/syntax/example_test.go b/syntax/example_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func Example() {

diff --git a/syntax/example_walk_test.go b/syntax/example_walk_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"mvdan.cc/sh/v2/syntax"
+	"mvdan.cc/sh/syntax"
 )
 
 func ExampleWalk() {