diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e9a6e6e5..a90354f6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -55,4 +55,4 @@ RUN go install golang.org/x/tools/gopls@v0.21.1 \ # files. chown the entire tree so vscode can write (GOTOOLCHAIN=auto downloads). RUN mkdir -p /home/vscode/bin \ && chown -R vscode:vscode /home/vscode/go /home/vscode/bin -ENV PATH="/home/vscode/bin:${PATH}" +ENV PATH="${GOPATH}/bin:/home/vscode/bin:${PATH}" diff --git a/.gitattributes b/.gitattributes index 032c1bd1..ffa0f023 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,7 @@ * text=auto +*.bat text eol=crlf +*.cmd text eol=crlf +*.sh text eol=lf +utf8out_linux.txt text eol=lf +utf8out.txt text eol=crlf diff --git a/build/build.sh b/build/build.sh index e241d7f5..9e3c46ad 100644 --- a/build/build.sh +++ b/build/build.sh @@ -1,9 +1,11 @@ #!/bin/sh -scriptdir=`dirname $0` -versionTag=`git describe --tags --abbrev=0` -go build -o $scriptdir/../sqlcmd -ldflags="-X main.version=$versionTag" $scriptdir/../cmd/modern +scriptdir=$(realpath "$(dirname "$0")") +versionTag=$(git describe --tags --abbrev=0) +go build -o "$scriptdir/../sqlcmd" -ldflags="-X main.version=$versionTag" "$scriptdir/../cmd/modern" go install github.com/google/go-licenses@latest -go-licenses report github.com/microsoft/go-sqlcmd/cmd/modern --template build/NOTICE.tpl --ignore github.com/microsoft > $scriptdir/notice.txt -cat $scriptdir/NOTICE.header $scriptdir/notice.txt > $scriptdir/../NOTICE.md -rm $scriptdir/notice.txt +go-licenses report github.com/microsoft/go-sqlcmd/cmd/modern \ + --ignore github.com/microsoft \ + --template "$scriptdir/NOTICE.tpl" > "$scriptdir/notice.txt" +cat "$scriptdir/NOTICE.header" "$scriptdir/notice.txt" > "$scriptdir/../NOTICE.md" +rm "$scriptdir/notice.txt"