From d7a7df726d696f7c875c7245d1a75a0302913dc8 Mon Sep 17 00:00:00 2001
From: Jan Frenzel <jan.frenzel@tu-dresden.de>
Date: Mon, 6 May 2024 10:09:05 +0200
Subject: [PATCH] Use $ for variables longer than 1 char, double brackets in if
clauses
---
.../util/check-bash-syntax.sh | 28 ++++----
.../util/check-code-style.sh | 6 +-
.../util/check-empty-page.sh | 6 +-
doc.zih.tu-dresden.de/util/check-filesize.sh | 14 ++--
.../util/check-links-non-mkdocs.sh | 48 ++++++-------
doc.zih.tu-dresden.de/util/check-links.sh | 2 +-
doc.zih.tu-dresden.de/util/check-spelling.sh | 68 +++++++++----------
.../util/check-templated-code-snippets.sh | 20 +++---
.../util/create-issues-all-pages.sh | 12 ++--
.../util/grep-forbidden-patterns.sh | 24 +++----
doc.zih.tu-dresden.de/util/lint-changes.sh | 18 ++---
.../util/test-grep-forbidden-patterns.sh | 4 +-
12 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/doc.zih.tu-dresden.de/util/check-bash-syntax.sh b/doc.zih.tu-dresden.de/util/check-bash-syntax.sh
index ac0fcd462..e8aa66f5c 100755
--- a/doc.zih.tu-dresden.de/util/check-bash-syntax.sh
+++ b/doc.zih.tu-dresden.de/util/check-bash-syntax.sh
@@ -3,8 +3,8 @@
set -euo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-basedir=`dirname "$basedir"`
+basedir=`dirname "${scriptpath}"`
+basedir=`dirname "${basedir}"`
function usage () {
echo "$0 [options]"
@@ -45,35 +45,35 @@ done
branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-preview}"
-if [ $all_files = true ]; then
+if [[ ${all_files} == true ]]; then
echo "Search in all bash files."
- files=`git ls-tree --full-tree -r --name-only HEAD $basedir/docs/ | grep '\.sh$' || true`
-elif [[ ! -z $file ]]; then
- files=$file
+ files=`git ls-tree --full-tree -r --name-only HEAD ${basedir}/docs/ | grep '\.sh$' || true`
+elif [[ ! -z "${file}" ]]; then
+ files=${file}
else
echo "Search in git-changed files."
- files=`git diff --name-only "$(git merge-base HEAD "$branch")" | grep '\.sh$' || true`
+ files=`git diff --name-only "$(git merge-base HEAD "${branch}")" | grep '\.sh$' || true`
fi
cnt=0
-for f in $files; do
- if ! bash -n $f; then
- if [ $silent = false ]; then
- echo "Bash file $f has invalid syntax"
+for f in ${files}; do
+ if ! bash -n ${f}; then
+ if [[ ${silent} == false ]]; then
+ echo "Bash file ${f} has invalid syntax"
fi
((cnt=cnt+1))
fi
done
-case $cnt in
+case ${cnt} in
1)
echo "Bash files with invalid syntax: 1 match found"
;;
*)
- echo "Bash files with invalid syntax: $cnt matches found"
+ echo "Bash files with invalid syntax: ${cnt} matches found"
;;
esac
-if [ $cnt -gt 0 ]; then
+if [[ ${cnt} -gt 0 ]]; then
exit 1
fi
diff --git a/doc.zih.tu-dresden.de/util/check-code-style.sh b/doc.zih.tu-dresden.de/util/check-code-style.sh
index 8a0651938..5fae71527 100755
--- a/doc.zih.tu-dresden.de/util/check-code-style.sh
+++ b/doc.zih.tu-dresden.de/util/check-code-style.sh
@@ -130,12 +130,12 @@ for file in $files; do
any_fails=true
fi
- # Line length less than 80char length
+ # Line length less than 100 char length
file_ext="${file##*.}"
if [[ "${file_ext}" == "sh" ]]; then
#echo "Checking for max line length..."
- pattern='^.{80}.*$'
- warning="Recommended maximum line length is 80 characters."
+ pattern='^.{100}.*$'
+ warning="Recommended maximum line length is 100 characters."
if pattern_matches "${file}" "${pattern}" "${warning}"; then
any_fails=true
fi
diff --git a/doc.zih.tu-dresden.de/util/check-empty-page.sh b/doc.zih.tu-dresden.de/util/check-empty-page.sh
index 7c4fdc2cd..57fc589fc 100755
--- a/doc.zih.tu-dresden.de/util/check-empty-page.sh
+++ b/doc.zih.tu-dresden.de/util/check-empty-page.sh
@@ -3,9 +3,9 @@
set -euo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-basedir=`dirname "$basedir"`
+basedir=`dirname "${scriptpath}"`
+basedir=`dirname "${basedir}"`
-if find $basedir -name \*.md -exec wc -l {} \; | grep '^0 '; then
+if find "${basedir}" -name \*.md -exec wc -l {} \; | grep '^0 '; then
exit 1
fi
diff --git a/doc.zih.tu-dresden.de/util/check-filesize.sh b/doc.zih.tu-dresden.de/util/check-filesize.sh
index fbfcf9049..70d21f19a 100755
--- a/doc.zih.tu-dresden.de/util/check-filesize.sh
+++ b/doc.zih.tu-dresden.de/util/check-filesize.sh
@@ -33,22 +33,22 @@
large_files_present=false
branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-preview}"
-source_hash=`git merge-base HEAD "$branch"`
+source_hash=`git merge-base HEAD "${branch}"`
lfsfiles=$(git lfs ls-files -n)
-for f in $(git diff $source_hash --name-only); do
+for f in $(git diff ${source_hash} --name-only); do
# Do not check size of git lfs files.
- if [[ $lfsfiles =~ "$f" ]]; then
+ if [[ ${lfsfiles} =~ "${f}" ]]; then
echo "Skip file ${f} because it is a git lfs file."
continue
fi
- fs=$(wc -c $f | awk '{print $1}')
- if [ $fs -gt 1048576 ]; then
- echo $f 'is over 1M ('$fs' bytes)'
+ fs=$(wc -c ${f} | awk '{print $1}')
+ if [[ ${fs} -gt 1048576 ]]; then
+ echo ${f} 'is over 1M ('${fs}' bytes)'
large_files_present=true
fi
done
-if [ "$large_files_present" == true ]; then
+if [[ "${large_files_present}" == true ]]; then
exit 1
fi
diff --git a/doc.zih.tu-dresden.de/util/check-links-non-mkdocs.sh b/doc.zih.tu-dresden.de/util/check-links-non-mkdocs.sh
index a1b28c271..587948b7a 100755
--- a/doc.zih.tu-dresden.de/util/check-links-non-mkdocs.sh
+++ b/doc.zih.tu-dresden.de/util/check-links-non-mkdocs.sh
@@ -11,8 +11,8 @@
set -eo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-basedir=`dirname "$basedir"`
+basedir=`dirname "${scriptpath}"`
+basedir=`dirname "${basedir}"`
usage() {
cat <<-EOF
@@ -24,33 +24,33 @@ EOF
}
mlc=markdown-link-check
-if ! command -v $mlc &> /dev/null; then
- echo "INFO: $mlc not found in PATH (global module)"
- mlc=./node_modules/markdown-link-check/$mlc
- if ! command -v $mlc &> /dev/null; then
- echo "INFO: $mlc not found (local module)"
+if ! command -v ${mlc} &> /dev/null; then
+ echo "INFO: ${mlc} not found in PATH (global module)"
+ mlc=./node_modules/markdown-link-check/${mlc}
+ if ! command -v ${mlc} &> /dev/null; then
+ echo "INFO: ${mlc} not found (local module)"
exit 1
fi
fi
-echo "mlc: $mlc"
+echo "mlc: ${mlc}"
-LINK_CHECK_CONFIG="$basedir/util/link-check-config.json"
-if [ ! -f "$LINK_CHECK_CONFIG" ]; then
- echo $LINK_CHECK_CONFIG does not exist
+LINK_CHECK_CONFIG="${basedir}/util/link-check-config.json"
+if [[ ! -f "${LINK_CHECK_CONFIG}" ]]; then
+ echo ${LINK_CHECK_CONFIG} does not exist
exit 1
fi
branch="preview"
-if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
- branch="origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
+if [[ -n "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" ]]; then
+ branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}"
fi
function checkSingleFile(){
theFile="$1"
- if [ -e "$theFile" ]; then
- echo "Checking links in $theFile"
- if ! $mlc -q -c "$LINK_CHECK_CONFIG" -p "$theFile"; then
+ if [[ -e "${theFile}" ]]; then
+ echo "Checking links in ${theFile}"
+ if ! ${mlc} -q -c "${LINK_CHECK_CONFIG}" -p "${theFile}"; then
return 1
fi
fi
@@ -60,30 +60,30 @@ function checkSingleFile(){
function checkFiles(){
any_fails=false
echo "Check files:"
-echo "$files"
+echo "${files}"
echo ""
-for f in $files; do
- if ! checkSingleFile "$f"; then
+for f in ${files}; do
+ if ! checkSingleFile "${f}"; then
any_fails=true
fi
done
-if [ "$any_fails" == true ]; then
+if [[ "${any_fails}" == true ]]; then
exit 1
fi
}
function checkAllFiles(){
-files=$(git ls-tree --full-tree -r --name-only HEAD $basedir/ | grep '.md$' || true)
+files=$(git ls-tree --full-tree -r --name-only HEAD ${basedir}/ | grep '.md$' || true)
checkFiles
}
function checkChangedFiles(){
-files=$(git diff --name-only "$(git merge-base HEAD "$branch")" | grep '.md$' || true)
+files=$(git diff --name-only "$(git merge-base HEAD "${branch}")" | grep '.md$' || true)
checkFiles
}
-if [ $# -eq 1 ]; then
+if [[ $# -eq 1 ]]; then
case $1 in
help | -help | --help)
usage
@@ -96,7 +96,7 @@ if [ $# -eq 1 ]; then
checkSingleFile "$1"
;;
esac
-elif [ $# -eq 0 ]; then
+elif [[ $# -eq 0 ]]; then
checkChangedFiles
else
usage
diff --git a/doc.zih.tu-dresden.de/util/check-links.sh b/doc.zih.tu-dresden.de/util/check-links.sh
index ca91a0212..c876dcd78 100755
--- a/doc.zih.tu-dresden.de/util/check-links.sh
+++ b/doc.zih.tu-dresden.de/util/check-links.sh
@@ -38,7 +38,7 @@ while getopts ":a" option; do
done
# Switch for wikiscript
-if [ -d "doc.zih.tu-dresden.de" ]; then
+if [[ -d "doc.zih.tu-dresden.de" ]]; then
cd doc.zih.tu-dresden.de
fi
diff --git a/doc.zih.tu-dresden.de/util/check-spelling.sh b/doc.zih.tu-dresden.de/util/check-spelling.sh
index d97f93e20..7c3978dcf 100755
--- a/doc.zih.tu-dresden.de/util/check-spelling.sh
+++ b/doc.zih.tu-dresden.de/util/check-spelling.sh
@@ -3,9 +3,9 @@
set -euo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-basedir=`dirname "$basedir"`
-wordlistfile=$(realpath $basedir/wordlist.aspell)
+basedir=`dirname "${scriptpath}"`
+basedir=`dirname "${basedir}"`
+wordlistfile=$(realpath ${basedir}/wordlist.aspell)
branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-preview}"
files_to_skip=(doc.zih.tu-dresden.de/docs/accessibility.md doc.zih.tu-dresden.de/docs/data_protection_declaration.md doc.zih.tu-dresden.de/docs/legal_notice.md doc.zih.tu-dresden.de/docs/access/key_fingerprints.md)
aspellmode=
@@ -19,12 +19,12 @@ usage: $0 [file | -a]
If file is given, outputs all words of the file, that the spell checker cannot recognize.
If parameter -a (or --all) is given instead of the file, checks all markdown files.
Otherwise, checks whether any changed file contains more unrecognizable words than before the change.
-If you are sure a word is correct, you can put it in $wordlistfile.
+If you are sure a word is correct, you can put it in ${wordlistfile}.
EOF
}
function getAspellOutput(){
- aspell -p "$wordlistfile" --ignore 2 -l en_US $aspellmode list | sort -u
+ aspell -p "${wordlistfile}" --ignore 2 -l en_US ${aspellmode} list | sort -u
}
function getNumberOfAspellOutputLines(){
@@ -34,7 +34,7 @@ function getNumberOfAspellOutputLines(){
function isWordlistSorted(){
#Unfortunately, sort depends on locale and docker does not provide much.
#Therefore, it uses bytewise comparison. We avoid problems with the command tr.
- if sed 1d "$wordlistfile" | tr [:upper:] [:lower:] | sort -C; then
+ if sed 1d "${wordlistfile}" | tr [:upper:] [:lower:] | sort -C; then
return 1
fi
return 0
@@ -48,26 +48,26 @@ function checkAllFiles(){
any_fails=false
if isWordlistSorted; then
- echo "Unsorted wordlist in $wordlistfile"
+ echo "Unsorted wordlist in ${wordlistfile}"
any_fails=true
fi
- files=$(git ls-tree --full-tree -r --name-only HEAD $basedir/ | grep .md)
+ files=$(git ls-tree --full-tree -r --name-only HEAD ${basedir}/ | grep .md)
while read file; do
- if [ "${file: -3}" == ".md" ]; then
+ if [[ "${file: -3}" == ".md" ]]; then
if shouldSkipFile ${file}; then
- echo "Skip $file"
+ echo "Skip ${file}"
else
- echo "Check $file"
- echo "-- File $file"
- if { cat "$file" | getAspellOutput | tee /dev/fd/3 | grep -xq '.*'; } 3>&1; then
+ echo "Check ${file}"
+ echo "-- File ${file}"
+ if { cat "${file}" | getAspellOutput | tee /dev/fd/3 | grep -xq '.*'; } 3>&1; then
any_fails=true
fi
fi
fi
- done <<< "$files"
+ done <<< "${files}"
- if [ "$any_fails" == true ]; then
+ if [[ "${any_fails}" == true ]]; then
return 1
fi
return 0
@@ -77,54 +77,54 @@ function isMistakeCountIncreasedByChanges(){
any_fails=false
if isWordlistSorted; then
- echo "Unsorted wordlist in $wordlistfile"
+ echo "Unsorted wordlist in ${wordlistfile}"
any_fails=true
fi
- source_hash=`git merge-base HEAD "$branch"`
+ source_hash=`git merge-base HEAD "${branch}"`
#Remove everything except lines beginning with --- or +++
- files=`git diff $source_hash | sed -E -n 's#^(---|\+\+\+) ((/|./)[^[:space:]]+)$#\2#p'`
- #echo "$files"
+ files=`git diff ${source_hash} | sed -E -n 's#^(---|\+\+\+) ((/|./)[^[:space:]]+)$#\2#p'`
+ #echo "${files}"
#echo "-------------------------"
#Assume that we have pairs of lines (starting with --- and +++).
while read oldfile; do
read newfile
- if [ "${newfile: -3}" == ".md" ]; then
+ if [[ "${newfile: -3}" == ".md" ]]; then
if shouldSkipFile ${newfile:2}; then
- echo "Skip $newfile"
+ echo "Skip ${newfile}"
else
- echo "Check $newfile"
- if [ "$oldfile" == "/dev/null" ]; then
+ echo "Check ${newfile}"
+ if [[ "${oldfile}" == "/dev/null" ]]; then
#Added files should not introduce new spelling mistakes
previous_count=0
else
- previous_count=`git show "$source_hash:${oldfile:2}" | getNumberOfAspellOutputLines`
+ previous_count=`git show "${source_hash}:${oldfile:2}" | getNumberOfAspellOutputLines`
fi
- if [ "$newfile" == "/dev/null" ]; then
+ if [[ "${newfile}" == "/dev/null" ]]; then
#Deleted files do not contain any spelling mistakes
current_count=0
else
#Remove the prefix "b/"
newfile=${newfile:2}
- current_count=`cat "$newfile" | getNumberOfAspellOutputLines`
+ current_count=`cat "${newfile}" | getNumberOfAspellOutputLines`
fi
- if [ $current_count -gt $previous_count ]; then
- echo "-- File $newfile"
- echo "Change increases spelling mistake count (from $previous_count to $current_count), misspelled/unknown words:"
- cat "$newfile" | getAspellOutput
+ if [[ ${current_count} -gt ${previous_count} ]]; then
+ echo "-- File ${newfile}"
+ echo "Change increases spelling mistake count (from ${previous_count} to ${current_count}), misspelled/unknown words:"
+ cat "${newfile}" | getAspellOutput
any_fails=true
fi
fi
fi
- done <<< "$files"
+ done <<< "${files}"
- if [ "$any_fails" == true ]; then
+ if [[ "${any_fails}" == true ]]; then
return 1
fi
return 0
}
-if [ $# -eq 1 ]; then
+if [[ $# -eq 1 ]]; then
case $1 in
help | -help | --help)
usage
@@ -137,7 +137,7 @@ if [ $# -eq 1 ]; then
cat "$1" | getAspellOutput
;;
esac
-elif [ $# -eq 0 ]; then
+elif [[ $# -eq 0 ]]; then
isMistakeCountIncreasedByChanges
else
usage
diff --git a/doc.zih.tu-dresden.de/util/check-templated-code-snippets.sh b/doc.zih.tu-dresden.de/util/check-templated-code-snippets.sh
index 2eecc039b..2cf1cc3a4 100755
--- a/doc.zih.tu-dresden.de/util/check-templated-code-snippets.sh
+++ b/doc.zih.tu-dresden.de/util/check-templated-code-snippets.sh
@@ -3,9 +3,9 @@
set -eo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-pythonscript="$basedir/check-templated-code-snippets.py"
-basedir=`dirname "$basedir"`
+basedir=`dirname "${scriptpath}"`
+pythonscript="${basedir}/check-templated-code-snippets.py"
+basedir=`dirname "${basedir}"`
function usage() {
cat <<-EOF
@@ -20,7 +20,7 @@ EOF
branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-preview}"
# Options
-if [ $# -eq 1 ]; then
+if [[ $# -eq 1 ]]; then
case $1 in
help | -help | --help)
usage
@@ -28,27 +28,27 @@ if [ $# -eq 1 ]; then
;;
-a | --all)
echo "Search in all markdown files."
- files=$(git ls-tree --full-tree -r --name-only HEAD $basedir/ | grep .md)
+ files=$(git ls-tree --full-tree -r --name-only HEAD ${basedir}/ | grep .md)
;;
*)
files="$1"
;;
esac
-elif [ $# -eq 0 ]; then
+elif [[ $# -eq 0 ]]; then
echo "Search in git-changed files."
- files=`git diff --name-only "$(git merge-base HEAD "$branch")" | grep .md || true`
+ files=`git diff --name-only "$(git merge-base HEAD "${branch}")" | grep .md || true`
else
usage
fi
all_ok=''
-for f in $files; do
-if ! $pythonscript $f; then
+for f in ${files}; do
+if ! ${pythonscript} ${f}; then
all_ok='no'
fi
done
-if [ -z "$all_ok" ]; then
+if [[ -z "${all_ok}" ]]; then
echo "Success!"
else
echo "Fail!"
diff --git a/doc.zih.tu-dresden.de/util/create-issues-all-pages.sh b/doc.zih.tu-dresden.de/util/create-issues-all-pages.sh
index 0d41c7bd1..9e3b15bee 100755
--- a/doc.zih.tu-dresden.de/util/create-issues-all-pages.sh
+++ b/doc.zih.tu-dresden.de/util/create-issues-all-pages.sh
@@ -3,15 +3,15 @@
set -eo pipefail
scriptpath=${BASH_SOURCE[0]}
-basedir=`dirname "$scriptpath"`
-basedir=`dirname "$basedir"`
+basedir=`dirname "${scriptpath}"`
+basedir=`dirname "${basedir}"`
-files=$(git ls-tree --full-tree -r --name-only HEAD $basedir/ | grep '\.md$' | grep -v '/archive/' || true)
+files=$(git ls-tree --full-tree -r --name-only HEAD ${basedir}/ | grep '\.md$' | grep -v '/archive/' || true)
description=""
-for f in $files; do
-description="$description- [ ] $f
+for f in ${files}; do
+description="${description}- [ ] ${f}
"
done
-curl --request POST --header "PRIVATE-TOKEN: $SCHEDULED_PAGE_CHECK_PAT" --form 'title="Regular check of all pages"' --form "description=\"$description\"" --form "labels=Bot" https://gitlab.hrz.tu-chemnitz.de/api/v4/projects/${CI_PROJECT_ID}/issues
+curl --request POST --header "PRIVATE-TOKEN: ${SCHEDULED_PAGE_CHECK_PAT}" --form 'title="Regular check of all pages"' --form "description=\"${description}\"" --form "labels=Bot" https://gitlab.hrz.tu-chemnitz.de/api/v4/projects/${CI_PROJECT_ID}/issues
diff --git a/doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh b/doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh
index dba8b694d..b95b955f8 100755
--- a/doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh
+++ b/doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh
@@ -74,7 +74,7 @@ doc.zih.tu-dresden.de/docs/contrib/content_rules.md
i work[ -]\+space"
function grep_exceptions () {
- if [ $# -gt 0 ]; then
+ if [[ $# -gt 0 ]]; then
firstPattern=$1
shift
grep -v "${firstPattern}" | grep_exceptions "$@"
@@ -96,10 +96,10 @@ function check_file(){
while IFS=$'\t' read -r -a exceptionPatternsArray; do
# Prevent patterns from being printed when the script is invoked with
# default arguments.
- if [ ${verbose} = true ]; then
+ if [[ ${verbose} == true ]]; then
echo " Pattern: ${pattern}${skipping}"
fi
- if [ -z "${skipping}" ]; then
+ if [[ -z "${skipping}" ]]; then
grepflag=
case "${flags}" in
"i")
@@ -114,7 +114,7 @@ function check_file(){
((cnt=cnt+$number_of_matches))
# prevent messages when silent=true,
# only files, pattern matches and the summary are printed
- if [ ${silent} = false ]; then
+ if [[ ${silent} == false ]]; then
echo " ${message}"
fi
fi
@@ -176,10 +176,10 @@ done
branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-preview}"
-if [ ${all_files} = true ]; then
+if [[ ${all_files} == true ]]; then
echo "Search in all markdown files."
files=$(git ls-tree --full-tree -r --name-only HEAD ${basedir}/ | grep .md)
-elif [[ ! -z ${file} ]]; then
+elif [[ ! -z "${file}" ]]; then
files=${file}
else
echo "Search in git-changed files."
@@ -188,16 +188,16 @@ fi
#Prevent files from being printed when the script is invoked with default
# arguments.
-if [ ${verbose} = true ]; then
+if [[ ${verbose} == true ]]; then
echo "... ${files} ..."
fi
cnt=0
-if [[ ! -z ${file} ]]; then
- check_file ${file}
+if [[ ! -z "${file}" ]]; then
+ check_file "${file}"
else
for f in ${files}; do
- if [ "${f: -3}" == ".md" -a -f "${f}" ]; then
- check_file ${f}
+ if [[ "${f: -3}" == ".md" && -f "${f}" ]]; then
+ check_file "${f}"
fi
done
fi
@@ -211,6 +211,6 @@ case ${cnt} in
echo "Forbidden Patterns: ${cnt} matches found"
;;
esac
-if [ ${cnt} -gt 0 ]; then
+if [[ ${cnt} -gt 0 ]]; then
exit 1
fi
diff --git a/doc.zih.tu-dresden.de/util/lint-changes.sh b/doc.zih.tu-dresden.de/util/lint-changes.sh
index 05ee57844..0e4013784 100755
--- a/doc.zih.tu-dresden.de/util/lint-changes.sh
+++ b/doc.zih.tu-dresden.de/util/lint-changes.sh
@@ -3,25 +3,25 @@
set -euo pipefail
branch="preview"
-if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
- branch="origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
+if [[ -n "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" ]]; then
+ branch="origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}"
fi
configfile=$(dirname $0)/../.markdownlintrc
-echo "config: $configfile"
+echo "config: ${configfile}"
any_fails=false
-files=$(git diff --name-only "$(git merge-base HEAD "$branch")")
-for f in $files; do
- if [ "${f: -3}" == ".md" ]; then
- echo "Linting $f"
- if ! markdownlint -c $configfile "$f"; then
+files=$(git diff --name-only "$(git merge-base HEAD "${branch}")")
+for f in ${files}; do
+ if [[ "${f: -3}" == ".md" ]]; then
+ echo "Linting ${f}"
+ if ! markdownlint -c ${configfile} "${f}"; then
any_fails=true
fi
fi
done
-if [ "$any_fails" == true ]; then
+if [[ "${any_fails}" == true ]]; then
exit 1
fi
diff --git a/doc.zih.tu-dresden.de/util/test-grep-forbidden-patterns.sh b/doc.zih.tu-dresden.de/util/test-grep-forbidden-patterns.sh
index 1e98caf52..f9af81cf5 100755
--- a/doc.zih.tu-dresden.de/util/test-grep-forbidden-patterns.sh
+++ b/doc.zih.tu-dresden.de/util/test-grep-forbidden-patterns.sh
@@ -4,10 +4,10 @@ expected_match_count=32
number_of_matches=$(bash ./doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh -f doc.zih.tu-dresden.de/util/grep-forbidden-patterns.testdoc -c -c | grep "Forbidden Patterns:" | sed -e 's/.*: //' | sed -e 's/ matches.*//')
-if [ $number_of_matches -eq $expected_match_count ]; then
+if [[ ${number_of_matches} -eq ${expected_match_count} ]]; then
echo "Test OK"
exit 0
else
- echo "Test failed: $expected_match_count matches expected, but only $number_of_matches found"
+ echo "Test failed: ${expected_match_count} matches expected, but only ${number_of_matches} found"
exit 1
fi
--
GitLab