feat: migrate to Go module

marjune163 · marjune163 · commit b4bee2db75cd · 2022-08-20T15:25:16.000+08:00
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Simple command line based HTTP file server to share local file system.
 ## Compile
 Minimal required Go version is 1.18.
 ```sh
-GO111MODULE=auto go build src/main.go
+go build src/main.go
 ```
 Will generate executable file "main" in current directory.
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -15,7 +15,7 @@
 ## 编译
 至少需要Go 1.18版本。
 ```sh
-GO111MODULE=auto go build src/main.go
+go build src/main.go
 ```
 会在当前目录生成"main"可执行文件。
 
diff --git a/build/build-docker-image-dockerfile b/build/build-docker-image-dockerfile
@@ -1,5 +1,4 @@
 FROM golang AS builder
-ENV GO111MODULE=auto
 COPY .git/ /mnt/ghfs/.git/
 COPY src/ /mnt/ghfs/src/
 COPY build/ /mnt/ghfs/build/
diff --git a/build/build.sh b/build/build.sh
@@ -2,7 +2,6 @@
 
 cd $(dirname "$0")
 
-export GO111MODULE=auto
 source ./build.inc.sh
 
 mkdir -p "$OUTDIR"
diff --git a/go.mod b/go.mod
@@ -0,0 +1,3 @@
+module mjpclab.dev/ghfs
+
+go 1.19
diff --git a/src/app/accessibleUrls.go b/src/app/accessibleUrls.go
@@ -1,8 +1,8 @@
 package app
 
 import (
-	"../goVirtualHost"
-	"../util"
+	"mjpclab.dev/ghfs/src/goVirtualHost"
+	"mjpclab.dev/ghfs/src/util"
 	"strconv"
 )
 
diff --git a/src/app/main.go b/src/app/main.go
@@ -1,14 +1,14 @@
 package app
 
 import (
-	"../goVirtualHost"
-	"../param"
-	"../serverError"
-	"../serverHandler"
-	"../serverLog"
-	"../setting"
-	"../tpl"
-	"../util"
+	"mjpclab.dev/ghfs/src/goVirtualHost"
+	"mjpclab.dev/ghfs/src/param"
+	"mjpclab.dev/ghfs/src/serverError"
+	"mjpclab.dev/ghfs/src/serverHandler"
+	"mjpclab.dev/ghfs/src/serverLog"
+	"mjpclab.dev/ghfs/src/setting"
+	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/util"
 	"os"
 	"path/filepath"
 	"strconv"
diff --git a/src/main.go b/src/main.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"./app"
-	"./param"
-	"./serverError"
-	"./setting"
-	"./version"
 	"errors"
+	"mjpclab.dev/ghfs/src/app"
+	"mjpclab.dev/ghfs/src/param"
+	"mjpclab.dev/ghfs/src/serverError"
+	"mjpclab.dev/ghfs/src/setting"
+	"mjpclab.dev/ghfs/src/version"
 	"os"
 	"os/signal"
 	"syscall"
diff --git a/src/param/cli.go b/src/param/cli.go
@@ -1,9 +1,9 @@
 package param
 
 import (
-	"../goNixArgParser"
-	"../serverError"
 	"errors"
+	"mjpclab.dev/ghfs/src/goNixArgParser"
+	"mjpclab.dev/ghfs/src/serverError"
 	"net/http"
 	"os"
 	"strconv"
diff --git a/src/param/main.go b/src/param/main.go
@@ -1,9 +1,9 @@
 package param
 
 import (
-	"../serverError"
-	"../util"
 	"crypto/tls"
+	"mjpclab.dev/ghfs/src/serverError"
+	"mjpclab.dev/ghfs/src/util"
 	"os"
 )
 
diff --git a/src/param/objUtil.go b/src/param/objUtil.go
@@ -1,8 +1,8 @@
 package param
 
 import (
-	"../goVirtualHost"
 	"crypto/tls"
+	"mjpclab.dev/ghfs/src/goVirtualHost"
 	"strings"
 )
 
diff --git a/src/param/strUtil.go b/src/param/strUtil.go
@@ -1,7 +1,7 @@
 package param
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"path/filepath"
 	"strings"
 	"unicode/utf8"
diff --git a/src/param/strUtil_test.go b/src/param/strUtil_test.go
@@ -1,7 +1,7 @@
 package param
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"path/filepath"
 	"testing"
 )
diff --git a/src/serverHandler/alias.go b/src/serverHandler/alias.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"strings"
 )
 
diff --git a/src/serverHandler/aliasHandler.go b/src/serverHandler/aliasHandler.go
@@ -1,10 +1,10 @@
 package serverHandler
 
 import (
-	"../param"
-	"../serverLog"
-	"../tpl"
-	"../user"
+	"mjpclab.dev/ghfs/src/param"
+	"mjpclab.dev/ghfs/src/serverLog"
+	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/user"
 	"net/http"
 	"regexp"
 	"strings"
diff --git a/src/serverHandler/archive.go b/src/serverHandler/archive.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"net/url"
 	"os"
diff --git a/src/serverHandler/content.go b/src/serverHandler/content.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"net/url"
 	"os"
diff --git a/src/serverHandler/header.go b/src/serverHandler/header.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 )
 
diff --git a/src/serverHandler/hsts.go b/src/serverHandler/hsts.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 )
 
diff --git a/src/serverHandler/log.go b/src/serverHandler/log.go
@@ -1,8 +1,8 @@
 package serverHandler
 
 import (
-	"../serverLog"
-	"../util"
+	"mjpclab.dev/ghfs/src/serverLog"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"net/url"
 )
diff --git a/src/serverHandler/multiplexHandler.go b/src/serverHandler/multiplexHandler.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../param"
+	"mjpclab.dev/ghfs/src/param"
 	"net/http"
 )
 
diff --git a/src/serverHandler/page.go b/src/serverHandler/page.go
@@ -1,12 +1,12 @@
 package serverHandler
 
 import (
-	"../acceptHeaders"
-	"../i18n"
-	tplutil "../tpl/util"
-	"../util"
 	"html/template"
 	"io"
+	"mjpclab.dev/ghfs/src/acceptHeaders"
+	"mjpclab.dev/ghfs/src/i18n"
+	tplutil "mjpclab.dev/ghfs/src/tpl/util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 )
 
diff --git a/src/serverHandler/pathTransformHandler.go b/src/serverHandler/pathTransformHandler.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 )
 
diff --git a/src/serverHandler/perm.go b/src/serverHandler/perm.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"os"
 )
 
diff --git a/src/serverHandler/responseData.go b/src/serverHandler/responseData.go
@@ -1,9 +1,9 @@
 package serverHandler
 
 import (
-	"../i18n"
-	"../util"
 	"html/template"
+	"mjpclab.dev/ghfs/src/i18n"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"os"
 	"path"
diff --git a/src/serverHandler/restrictAccess.go b/src/serverHandler/restrictAccess.go
@@ -1,7 +1,7 @@
 package serverHandler
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"os"
 	"strings"
diff --git a/src/serverHandler/sort.go b/src/serverHandler/sort.go
@@ -1,8 +1,8 @@
 package serverHandler
 
 import (
-	"../util"
 	"bytes"
+	"mjpclab.dev/ghfs/src/util"
 	"os"
 	"sort"
 	"strings"
diff --git a/src/serverHandler/upload.go b/src/serverHandler/upload.go
@@ -1,11 +1,11 @@
 package serverHandler
 
 import (
-	"../util"
 	"errors"
 	"io"
 	"mime"
 	"mime/multipart"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"os"
 	"path/filepath"
diff --git a/src/serverHandler/util.go b/src/serverHandler/util.go
@@ -1,11 +1,11 @@
 package serverHandler
 
 import (
-	"../acceptHeaders"
-	"../util"
 	"compress/flate"
 	"compress/gzip"
 	"io"
+	"mjpclab.dev/ghfs/src/acceptHeaders"
+	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 	"os"
 	"path"
diff --git a/src/serverHandler/vhostHandler.go b/src/serverHandler/vhostHandler.go
@@ -1,11 +1,11 @@
 package serverHandler
 
 import (
-	"../param"
-	"../serverError"
-	"../serverLog"
-	"../tpl"
-	"../user"
+	"mjpclab.dev/ghfs/src/param"
+	"mjpclab.dev/ghfs/src/serverError"
+	"mjpclab.dev/ghfs/src/serverLog"
+	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/user"
 	"net/http"
 	"strings"
 )
diff --git a/src/serverLog/buffer.go b/src/serverLog/buffer.go
@@ -1,7 +1,7 @@
 package serverLog
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"time"
 )
 
diff --git a/src/setting/main.go b/src/setting/main.go
@@ -1,7 +1,7 @@
 package setting
 
 import (
-	"../util"
+	"mjpclab.dev/ghfs/src/util"
 	"os"
 )
 
diff --git a/src/tpl/asset.go b/src/tpl/asset.go
@@ -1,9 +1,9 @@
 package tpl
 
 import (
-	"../util"
 	"bytes"
 	"io"
+	"mjpclab.dev/ghfs/src/util"
 )
 
 type asset struct {
diff --git a/src/tpl/template.go b/src/tpl/template.go
@@ -1,8 +1,8 @@
 package tpl
 
 import (
-	"./util"
 	"html/template"
+	"mjpclab.dev/ghfs/src/tpl/util"
 )
 
 func ParsePageTpl(tplText string) (tpl *template.Template, err error) {
diff --git a/src/user/list.go b/src/user/list.go
@@ -1,8 +1,8 @@
 package user
 
 import (
-	"../util"
 	"errors"
+	"mjpclab.dev/ghfs/src/util"
 )
 
 type List struct {
diff --git a/test/main.bash b/test/main.bash
@@ -17,7 +17,7 @@ export src=$(realpath ../src)
 export ghfs=$(realpath bin)/ghfs
 export GHFS_QUIET=1
 
-GO111MODULE=auto go build -o "$ghfs" "$src/main.go"
+go build -o "$ghfs" "$src/main.go"
 
 pattern="$1"
 if [ -z "$pattern" ]; then

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM golang AS builder`
`2`		`-ENV GO111MODULE=auto`
`3`	`2`	`COPY .git/ /mnt/ghfs/.git/`
`4`	`3`	`COPY src/ /mnt/ghfs/src/`
`5`	`4`	`COPY build/ /mnt/ghfs/build/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module mjpclab.dev/ghfs`
	`2`	`+`
	`3`	`+go 1.19`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package app`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "../goVirtualHost"`
`5`		`- "../util"`
	`4`	`+ "mjpclab.dev/ghfs/src/goVirtualHost"`
	`5`	`+ "mjpclab.dev/ghfs/src/util"`
`6`	`6`	`"strconv"`
`7`	`7`	`)`
`8`	`8`