From 01bb8f6a87d81a2ed5e85cd2ca0362ab408a5c7b Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sun, 15 Nov 2026 11:11:12 +0100 Subject: [PATCH 1/4] fix: ensure correct line endings for various files --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) 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 From 67da251ac595188b3d716c8e5ed7180d1868da3f Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sun, 15 Nov 2026 11:13:16 +0100 Subject: [PATCH 2/4] fix: GOPATH is not included in PATH --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}" From 37341f7a38978c7a6dd80efa34c7cd95787b3dbb Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sun, 15 Nov 2026 11:17:00 +0100 Subject: [PATCH 3/4] fix: incorrect script path for NOTICE.tpl in build/build.sh --- build/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/build.sh b/build/build.sh index e241d7f5..84941e83 100644 --- a/build/build.sh +++ b/build/build.sh @@ -4,6 +4,8 @@ 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 +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 From 6055fde2ab9069c52a4318c457dbab589a3c3bdd Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sun, 15 Nov 2026 12:02:41 +0100 Subject: [PATCH 4/4] fix: resolve build script path before building Fixed the following issue when calling the build script using `build/build.sh` instead of `./build/build.sh`: ``` package cmd/modern is not in std (/usr/local/go/src/cmd/modern) ``` Besides, quote every subsequent expansion of `scriptdir`, even though the standard checkout path does not contain spaces. --- build/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build.sh b/build/build.sh index 84941e83..9e3c46ad 100644 --- a/build/build.sh +++ b/build/build.sh @@ -1,11 +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 \ --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 + --template "$scriptdir/NOTICE.tpl" > "$scriptdir/notice.txt" +cat "$scriptdir/NOTICE.header" "$scriptdir/notice.txt" > "$scriptdir/../NOTICE.md" +rm "$scriptdir/notice.txt"