Skip to content

Commit b5419cf

Browse files
refactor: Update versions & remove &&
1 parent f4b807e commit b5419cf

14 files changed

Lines changed: 63 additions & 63 deletions

.devcontainer/library-scripts/editorconfig-alpine.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ function editorconfig_inst() {
3434
ARCH=amd64
3535
;;
3636
esac
37-
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT &&
38-
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 &&
39-
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec &&
40-
rm ec-$OS-$ARCH.$EXT &&
41-
chown root /usr/local/bin/ec &&
42-
chgrp root /usr/local/bin/ec
37+
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT
38+
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1
39+
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec
40+
rm ec-$OS-$ARCH.$EXT
41+
chown root /usr/local/bin/ec
42+
chgrp root /usr/local/bin/ec
4343
}
4444

4545
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/editorconfig-debian.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ function editorconfig_inst() {
4040
ARCH=amd64
4141
;;
4242
esac
43-
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT &&
44-
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 &&
45-
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec &&
46-
rm ec-$OS-$ARCH.$EXT &&
47-
chown root /usr/local/bin/ec &&
48-
chgrp root /usr/local/bin/ec
43+
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT
44+
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1
45+
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec
46+
rm ec-$OS-$ARCH.$EXT
47+
chown root /usr/local/bin/ec
48+
chgrp root /usr/local/bin/ec
4949
}
5050

5151
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/editorconfig.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ function editorconfig_inst() {
4848
ARCH=amd64
4949
;;
5050
esac
51-
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT &&
52-
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 &&
53-
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec &&
54-
rm ec-$OS-$ARCH.$EXT &&
55-
chown root /usr/local/bin/ec &&
56-
chgrp root /usr/local/bin/ec
51+
curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/"$EDITORCONFIG_VERSION"/ec-$OS-$ARCH.$EXT
52+
tar xzf ec-$OS-$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1
53+
mv /usr/local/bin/ec-linux-amd64 /usr/local/bin/ec
54+
rm ec-$OS-$ARCH.$EXT
55+
chown root /usr/local/bin/ec
56+
chgrp root /usr/local/bin/ec
5757
}
5858

5959
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/hadolint-alpine.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
HADOLINT_VERSION=${1:-"2.10.0"}
5+
HADOLINT_VERSION=${1:-"2.12.0"}
66
SCRIPT=("${BASH_SOURCE[@]}")
77
SCRIPT_PATH="${SCRIPT##*/}"
88
SCRIPT_NAME="${SCRIPT_PATH%.*}"
@@ -28,9 +28,9 @@ function hadolint_inst() {
2828
;;
2929
esac
3030
ARCH=$(uname -m)
31-
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH" &&
32-
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint &&
33-
chmod +x /usr/local/bin/hadolint
31+
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH"
32+
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint
33+
chmod +x /usr/local/bin/hadolint
3434
}
3535

3636
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/hadolint-debian.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
HADOLINT_VERSION=${1:-"2.10.0"}
5+
HADOLINT_VERSION=${1:-"2.12.0"}
66
SCRIPT=("${BASH_SOURCE[@]}")
77
SCRIPT_PATH="${SCRIPT##*/}"
88
SCRIPT_NAME="${SCRIPT_PATH%.*}"
@@ -34,9 +34,9 @@ function hadolint_inst() {
3434
;;
3535
esac
3636
ARCH=$(uname -m)
37-
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH" &&
38-
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint &&
39-
chmod +x /usr/local/bin/hadolint
37+
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH"
38+
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint
39+
chmod +x /usr/local/bin/hadolint
4040
}
4141

4242
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/hadolint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
HADOLINT_VERSION=${1:-"2.10.0"}
5+
HADOLINT_VERSION=${1:-"2.12.0"}
66
CONTAINER_OS=${2:-"alpine"}
77
SCRIPT=("${BASH_SOURCE[@]}")
88
SCRIPT_PATH="${SCRIPT##*/}"
@@ -42,9 +42,9 @@ function hadolint_inst() {
4242
;;
4343
esac
4444
ARCH=$(uname -m)
45-
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH" &&
46-
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint &&
47-
chmod +x /usr/local/bin/hadolint
45+
curl -O -L -C - https://github.com/hadolint/hadolint/releases/download/v"$HADOLINT_VERSION"/hadolint-$OS-"$ARCH"
46+
mv hadolint-$OS-"$ARCH" /usr/local/bin/hadolint
47+
chmod +x /usr/local/bin/hadolint
4848
}
4949

5050
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/shellcheck-alpine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
SHELLCHECK_VERSION=${1:-"0.8.0"}
5+
SHELLCHECK_VERSION=${1:-"0.9.0"}
66
SCRIPT=("${BASH_SOURCE[@]}")
77
SCRIPT_PATH="${SCRIPT##*/}"
88
SCRIPT_NAME="${SCRIPT_PATH%.*}"

.devcontainer/library-scripts/shellcheck-debian.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
SHELLCHECK_VERSION=${1:-"0.8.0"}
5+
SHELLCHECK_VERSION=${1:-"0.9.0"}
66
SCRIPT=("${BASH_SOURCE[@]}")
77
SCRIPT_PATH="${SCRIPT##*/}"
88
SCRIPT_NAME="${SCRIPT_PATH%.*}"
@@ -40,11 +40,11 @@ function shellcheck_inst() {
4040
ARCH=x86_64
4141
;;
4242
esac
43-
wget -c https://github.com/koalaman/shellcheck/releases/download/v"$SHELLCHECK_VERSION"/shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT &&
44-
tar -xf shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 --exclude=*.txt &&
45-
rm shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT &&
46-
chown root /usr/local/bin/shellcheck &&
47-
chgrp root /usr/local/bin/shellcheck
43+
wget -c https://github.com/koalaman/shellcheck/releases/download/v"$SHELLCHECK_VERSION"/shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT
44+
tar -xf shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 --exclude=*.txt
45+
rm shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT
46+
chown root /usr/local/bin/shellcheck
47+
chgrp root /usr/local/bin/shellcheck
4848
}
4949

5050
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/shellcheck.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
SHELLCHECK_VERSION=${1:-"0.8.0"}
5+
SHELLCHECK_VERSION=${1:-"0.9.0"}
66
CONTAINER_OS=${2:-"alpine"}
77
SCRIPT=("${BASH_SOURCE[@]}")
88
SCRIPT_PATH="${SCRIPT##*/}"
@@ -48,11 +48,11 @@ function shellcheck_inst() {
4848
ARCH=x86_64
4949
;;
5050
esac
51-
wget -c https://github.com/koalaman/shellcheck/releases/download/v"$SHELLCHECK_VERSION"/shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT &&
52-
tar -xf shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 --exclude=*.txt &&
53-
rm shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT &&
54-
chown root /usr/local/bin/shellcheck &&
55-
chgrp root /usr/local/bin/shellcheck
51+
wget -c https://github.com/koalaman/shellcheck/releases/download/v"$SHELLCHECK_VERSION"/shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT
52+
tar -xf shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT --directory=/usr/local/bin/ --strip-components=1 --exclude=*.txt
53+
rm shellcheck-v"$SHELLCHECK_VERSION".$OS.$ARCH.$EXT
54+
chown root /usr/local/bin/shellcheck
55+
chgrp root /usr/local/bin/shellcheck
5656
}
5757

5858
if [ -f "${MARKER_FILE}" ]; then

.devcontainer/library-scripts/shfmt-alpine.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
SHFMT_VERSION=${1:-"3.5.1"}
5+
SHFMT_VERSION=${1:-"3.6.0"}
66
SCRIPT=("${BASH_SOURCE[@]}")
77
SCRIPT_PATH="${SCRIPT##*/}"
88
SCRIPT_NAME="${SCRIPT_PATH%.*}"
@@ -33,11 +33,11 @@ function shfmt_inst() {
3333
ARCH=amd64
3434
;;
3535
esac
36-
curl -O -L -C - https://github.com/mvdan/sh/releases/download/v$SHFMT_VERSION/shfmt_v"$SHFMT_VERSION"_"$OS"_"$ARCH" &&
37-
mv shfmt_v"$SHFMT_VERSION"_"$OS"_"$ARCH" /usr/local/bin/shfmt &&
38-
chmod +x /usr/local/bin/shfmt &&
39-
chown root /usr/local/bin/shfmt &&
40-
chgrp root /usr/local/bin/shfmt
36+
curl -O -L -C - https://github.com/mvdan/sh/releases/download/v$SHFMT_VERSION/shfmt_v"$SHFMT_VERSION"_"$OS"_"$ARCH"
37+
mv shfmt_v"$SHFMT_VERSION"_"$OS"_"$ARCH" /usr/local/bin/shfmt
38+
chmod +x /usr/local/bin/shfmt
39+
chown root /usr/local/bin/shfmt
40+
chgrp root /usr/local/bin/shfmt
4141
}
4242

4343
if [ -f "${MARKER_FILE}" ]; then

0 commit comments

Comments
 (0)