Skip to content

Commit 98b6e7e

Browse files
committed
style: remove unnecessary escape for builtin
1 parent 954b049 commit 98b6e7e

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/docker-build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
# shellcheck disable=SC2086
7878
VERSION="$(\grep ${IMAGE}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/@.*$//; s/^.*://;')"
7979
if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
80-
\echo "VERSION=${VERSION}" >> "${GITHUB_ENV}"
80+
echo "VERSION=${VERSION}" >> "${GITHUB_ENV}"
8181
fi
8282
- name: Check if release already exists
8383
if: env.VERSION != ''

pgp-verify-jar/bump-apk-versions.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ if [ -f /.dockerenv ]; then
1313

1414
u=$(\apk -u list | \tr '\n' '|')
1515

16-
\sed -e :a -e '/\\$/N; s/\\\n//; ta' Dockerfile | \grep -o -e 'apk[^\&\;]*add[^\&\;]*' | \grep -o -e '[^ ]*=[^ ]*' | while IFS= \read -r l; do
16+
\sed -e :a -e '/\\$/N; s/\\\n//; ta' Dockerfile | \grep -o -e 'apk[^\&\;]*add[^\&\;]*' | \grep -o -e '[^ ]*=[^ ]*' | while IFS= read -r l; do
1717
\rm -f .bump.csv.bak
1818
p="${l%=*}"
1919
v1="${l#*=}"
20-
v="$(\echo "|${u}" | \grep -o -e "\|${p}-[^\|]*upgradable from: ${p}-${v1}" || true)"
20+
v="$(echo "|${u}" | \grep -o -e "\|${p}-[^\|]*upgradable from: ${p}-${v1}" || true)"
2121
if [ -z "${v}" ]; then
2222
continue
2323
fi
24-
n=$(($(\echo -n "${p}" | wc -c) + 2))
25-
v2="$(\echo "${v}" | \cut -d ' ' -f 1 | \cut -c ${n}-)"
24+
n=$(($(echo -n "${p}" | wc -c) + 2))
25+
v2="$(echo "${v}" | \cut -d ' ' -f 1 | \cut -c ${n}-)"
2626
if [ -n "${v2}" ] && [ "${v2}" != "${v1}" ]; then
27-
\echo "${p} ${v1} -> ${v2}"
28-
\echo "${p},${v1},${v2},${p}=${v1},${p}=${v2}" >>.bump.csv.bak
27+
echo "${p} ${v1} -> ${v2}"
28+
echo "${p},${v1},${v2},${p}=${v1},${p}=${v2}" >>.bump.csv.bak
2929
fi
3030
done
3131

pgp-verify-jar/pgp-verify-jar.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,44 +184,44 @@ if [ -z ${VERIFICATION_MODE+x} ]; then
184184
fi
185185

186186
if [ "${VERIFICATION_MODE}" = 'online' ]; then
187-
\echo pgp-verify-jar: Using online verification mode.
187+
echo pgp-verify-jar: Using online verification mode.
188188
if [ -z ${KEYSERVER+x} ]; then
189189
KEYSERVER='keyserver.ubuntu.com'
190190
fi
191191
if [ -z ${BOOTSTRAP_ONLINE_KEYS+x} ]; then
192-
\echo pgp-verify-jar: No boostrap online key specified.
192+
echo pgp-verify-jar: No boostrap online key specified.
193193
else
194-
\echo pgp-verify-jar: Downloading boostrap keys "${BOOTSTRAP_ONLINE_KEYS}" from server "${KEYSERVER}"
194+
echo pgp-verify-jar: Downloading boostrap keys "${BOOTSTRAP_ONLINE_KEYS}" from server "${KEYSERVER}"
195195
IFS=',' read -ra keys <<<"${BOOTSTRAP_ONLINE_KEYS}"
196196
\gpg --batch --verbose --keyserver "${KEYSERVER}" --recv-keys "${keys[@]+"${keys[@]}"}"
197197
fi
198198
if [ -z ${ONLINE_KEYS+x} ]; then
199-
\echo pgp-verify-jar: WARN: No online key specified, all keys from server "${KEYSERVER}" can be used.
199+
echo pgp-verify-jar: WARN: No online key specified, all keys from server "${KEYSERVER}" can be used.
200200
else
201-
\echo pgp-verify-jar: Downloading keys "${ONLINE_KEYS}" from server "${KEYSERVER}"
201+
echo pgp-verify-jar: Downloading keys "${ONLINE_KEYS}" from server "${KEYSERVER}"
202202
IFS=',' read -ra keys <<<"${ONLINE_KEYS}"
203203
\gpg --batch --verbose --keyserver "${KEYSERVER}" --recv-keys "${keys[@]+"${keys[@]}"}"
204204
fi
205205
else
206-
\echo pgp-verify-jar: Using offline verification mode.
206+
echo pgp-verify-jar: Using offline verification mode.
207207
\unset KEYSERVER
208208
\unset ONLINE_KEYS
209209
fi
210210

211211
declare -a artifacts
212212

213213
if [ $# -ne 0 ]; then
214-
\echo pgp-verify-jar: Using artifacts from arguments
214+
echo pgp-verify-jar: Using artifacts from arguments
215215
artifacts=("${@}")
216216
elif [ -n "${ARTIFACTS+x}" ]; then
217-
\echo pgp-verify-jar: Using artifacts from ARTIFACTS environment variable
217+
echo pgp-verify-jar: Using artifacts from ARTIFACTS environment variable
218218
IFS=',' read -r -a artifacts <<<"${ARTIFACTS}"
219219
else
220220
die 'No artifact provided'
221221
fi
222222

223223
for artifact in "${artifacts[@]+"${artifacts[@]}"}"; do
224-
\echo pgp-verify-jar: Checking "${artifact}"
224+
echo pgp-verify-jar: Checking "${artifact}"
225225
if [[ "${artifact}" == *\@* ]]; then
226226
artifactPrefix="${artifact%\@*}"
227227
artifactExtension="${artifact##*\@}"
@@ -243,9 +243,9 @@ for artifact in "${artifacts[@]+"${artifacts[@]}"}"; do
243243
signatureUrl="${artifactUrl}.asc"
244244
signatureFile="${artifactFile}.asc"
245245
\mkdir -p "${DOWNLOAD_DIR}"
246-
\echo pgp-verify-jar: Downloading "${artifactUrl}"
246+
echo pgp-verify-jar: Downloading "${artifactUrl}"
247247
\curl -fsSL -o "${DOWNLOAD_DIR}/${artifactFile}" "${artifactUrl}"
248-
\echo pgp-verify-jar: Downloading "${signatureUrl}"
248+
echo pgp-verify-jar: Downloading "${signatureUrl}"
249249
\curl -fsSL -o "${DOWNLOAD_DIR}/${signatureFile}" "${signatureUrl}"
250250
if [ "${VERIFICATION_MODE}" = 'online' ] && [ -z ${ONLINE_KEYS+x} ]; then
251251
\gpg --auto-key-locate keyserver --keyserver "${KEYSERVER}" --keyserver-options auto-key-retrieve --verify "${DOWNLOAD_DIR}/${signatureFile}" "${DOWNLOAD_DIR}/${artifactFile}"

0 commit comments

Comments
 (0)