From 3eafcf94b78eef86db9d4e4f95f945761130567b Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 15 Mar 2021 15:13:44 -0700 Subject: [PATCH] refactor: remove shfmt --- ci/dev/fmt.sh | 2 -- ci/images/centos7/Dockerfile | 1 - ci/images/debian10/Dockerfile | 1 - docs/CONTRIBUTING.md | 20 ++++++++++---------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ci/dev/fmt.sh b/ci/dev/fmt.sh index 139c0ea0..cd589954 100755 --- a/ci/dev/fmt.sh +++ b/ci/dev/fmt.sh @@ -4,8 +4,6 @@ set -euo pipefail main() { cd "$(dirname "$0")/../.." - shfmt -i 2 -w -sr $(git ls-files "*.sh" | grep -v "lib/vscode") - local prettierExts prettierExts=( "*.js" diff --git a/ci/images/centos7/Dockerfile b/ci/images/centos7/Dockerfile index a37e590b..3a82dcf7 100644 --- a/ci/images/centos7/Dockerfile +++ b/ci/images/centos7/Dockerfile @@ -26,7 +26,6 @@ ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH # Install Go dependencies ENV GO111MODULE=on -RUN go get mvdan.cc/sh/v3/cmd/shfmt RUN go get github.com/goreleaser/nfpm/cmd/nfpm@v1.9.0 RUN curl -fsSL https://get.docker.com | sh diff --git a/ci/images/debian10/Dockerfile b/ci/images/debian10/Dockerfile index 5e4a5f85..20977641 100644 --- a/ci/images/debian10/Dockerfile +++ b/ci/images/debian10/Dockerfile @@ -42,7 +42,6 @@ ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH # Install Go dependencies ENV GO111MODULE=on -RUN go get mvdan.cc/sh/v3/cmd/shfmt RUN go get github.com/goreleaser/nfpm/cmd/nfpm@v1.9.0 RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" && \ diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 98c88d1b..5f9d6133 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,15 +2,16 @@ # Contributing -- [Pull Requests](#pull-requests) -- [Requirements](#requirements) -- [Development Workflow](#development-workflow) - - [Updating VS Code](#updating-vs-code) - - [Notes about Changes](#notes-about-changes) -- [Build](#build) -- [Structure](#structure) - - [Modifications to VS Code](#modifications-to-vs-code) - - [Currently Known Issues](#currently-known-issues) +- [Contributing](#contributing) + - [Pull Requests](#pull-requests) + - [Requirements](#requirements) + - [Development Workflow](#development-workflow) + - [Updating VS Code](#updating-vs-code) + - [Notes about Changes](#notes-about-changes) + - [Build](#build) + - [Structure](#structure) + - [Modifications to VS Code](#modifications-to-vs-code) + - [Currently Known Issues](#currently-known-issues) @@ -36,7 +37,6 @@ There are several differences, however. You must: - Use Node.js version 12.x (or greater) - Have [yarn](https://classic.yarnpkg.com/en/) installed (which is used to install JS packages and run development scripts) - Have [nfpm](https://github.com/goreleaser/nfpm) (which is used to build `.deb` and `.rpm` packages and [jq](https://stedolan.github.io/jq/) (used to build code-server releases) installed -- Have [shfmt](https://pkg.go.dev/mvdan.cc/sh/v3) installed to run `yarn fmt` (requires Go is installed on your system) The [CI container](../ci/images/debian10/Dockerfile) is a useful reference for all of the dependencies code-server uses.