Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Update scripts to pass Shellcheck lints #11166

Merged
merged 17 commits into from
Oct 27, 2021
Merged

Update scripts to pass Shellcheck lints #11166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
12d79ff
Fix Shellcheck SC2164: exit in case cd fails.
callahad Oct 18, 2021
64adbb7
Fix Shellcheck SC2046: Quote to prevent word split
callahad Oct 18, 2021
5eb481c
Fix Shellcheck SC2115: Ensure never expands to /*
callahad Oct 18, 2021
898e3be
Fix Shellcheck SC2064: Use single quotes on traps
callahad Oct 18, 2021
6c736fa
Fix Shellcheck SC2154: variable possibly undefined
callahad Oct 21, 2021
6a9d84a
Fix Shellcheck SC2166: test -a is not well defined
callahad Oct 21, 2021
dfa6143
Fix Shellcheck SC2155: Declare + export separately
callahad Oct 21, 2021
99e698d
Fix Shellcheck SC2089 and SC2090: Quotes in vars
callahad Oct 21, 2021
7cf83c0
Fix Shellcheck SC1001: Meaningless char escapes
callahad Oct 21, 2021
bab2bc8
Fix Shellcheck SC1091: Can't follow file
callahad Oct 21, 2021
9d0f9d5
Fix Shellcheck SC2016: Single quotes don't expand
callahad Oct 22, 2021
3109613
Fix Shellcheck SC2012: Use find instead of ls
callahad Oct 22, 2021
13f084e
Fix Shellcheck SC2086: Quote to prevent splitting
callahad Oct 22, 2021
b5e9105
Fix Shellcheck SC2129: Consider using {..} >> file
callahad Oct 22, 2021
d7141e0
Fix Shellcheck SC2006: Use $(...) notation
callahad Oct 22, 2021
1afc6ec
Changelog
callahad Oct 22, 2021
0dffa9d
Merge remote-tracking branch 'origin/develop' into shellcheck
callahad Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/scripts/test_export_data_command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Test for the export-data admin command against sqlite and postgres

set -xe
cd `dirname $0`/../..
cd "`dirname $0`/../.."

echo "--- Install dependencies"

Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/test_synapse_port_db.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


set -xe
cd `dirname $0`/../..
cd "`dirname $0`/../.."

echo "--- Install dependencies"

Expand Down
2 changes: 1 addition & 1 deletion debian/test/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e
apt-get update
apt-get install -y lsb-release

deb=`ls /debs/matrix-synapse-py3_*+$(lsb_release -cs)*.deb | sort | tail -n1`
deb=`ls "/debs/matrix-synapse-py3_*+$(lsb_release -cs)*.deb" | sort | tail -n1`

debconf-set-selections <<EOF
matrix-synapse matrix-synapse/report-stats boolean false
Expand Down
2 changes: 1 addition & 1 deletion demo/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$DIR/.." || exit

mkdir -p demo/etc

export PYTHONPATH=$(readlink -f $(pwd))
export PYTHONPATH=$(readlink -f "$(pwd)")


echo $PYTHONPATH
Expand Down
2 changes: 1 addition & 1 deletion scripts-dev/check_line_terminators.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# terminators are found, 0 otherwise.

# cd to the root of the repository
cd `dirname $0`/.. || exit
cd "`dirname $0`/.." || exit

# Find and print files with non-unix line terminators
if find . -path './.git/*' -prune -o -type f -print0 | xargs -0 grep -I -l $'\r$'; then
Expand Down
2 changes: 1 addition & 1 deletion scripts-dev/config-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Exits with 0 if there are no problems, or another code otherwise.

# cd to the root of the repository
cd `dirname $0`/.. || exit
cd "`dirname $0`/.." || exit

# Restore backup of sample config upon script exit
trap "mv docs/sample_config.yaml.bak docs/sample_config.yaml" EXIT
Expand Down
2 changes: 1 addition & 1 deletion scripts-dev/docker_update_debian_changelog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts

# Update the Debian changelog.
ver=${1}
dch -M -v $(sed -Ee 's/(rc|a|b|c)/~\1/' <<<$ver) "New synapse release $ver."
dch -M -v "$(sed -Ee 's/(rc|a|b|c)/~\1/' <<<$ver)" "New synapse release $ver."
dch -M -r -D stable ""
2 changes: 1 addition & 1 deletion scripts-dev/generate_sample_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -e

cd `dirname $0`/..
cd "`dirname $0`/.."

SAMPLE_CONFIG="docs/sample_config.yaml"
SAMPLE_LOG_CONFIG="docs/sample_log_config.yaml"
Expand Down