From 26d378fb7d0acf7c3bfe9287651bc689608642ec Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 3 Aug 2018 00:14:48 +0000 Subject: [PATCH] terminate-psql-sessions: Fix shellcheck warnings. In scripts/setup/terminate-psql-sessions line 5: [ "$1" = "`echo -e "$1\n$2" | sort -V | tail -n1`" ] ^-- SC2006: Use $(..) instead of legacy `..`. ^-- SC1117: Backslash is literal in "\n". Prefer explicit escaping: "\\n". In scripts/setup/terminate-psql-sessions line 20: major=$(echo $version | cut -d. -f1,2) ^-- SC2086: Double quote to prevent globbing and word splitting. In scripts/setup/terminate-psql-sessions line 24: tables=$(echo "'$@'" | sed "s/ /','/g") ^-- SC2145: Argument mixes string and array. Use * or separate argument. Signed-off-by: Anders Kaseorg --- scripts/setup/terminate-psql-sessions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup/terminate-psql-sessions b/scripts/setup/terminate-psql-sessions index 13dcc8ae63..470527cd62 100755 --- a/scripts/setup/terminate-psql-sessions +++ b/scripts/setup/terminate-psql-sessions @@ -2,7 +2,7 @@ set -e vergte() { - [ "$1" = "`echo -e "$1\n$2" | sort -V | tail -n1`" ] + [ "$1" = "$(echo -e "$1\\n$2" | sort -V | tail -n1)" ] } DEFAULT_USER="postgres" @@ -17,11 +17,11 @@ else version=$(psql -A -t -d postgres -c "show server_version") fi -major=$(echo $version | cut -d. -f1,2) +major=$(echo "$version" | cut -d. -f1,2) username=$1 shift -tables=$(echo "'$@'" | sed "s/ /','/g") +tables=$(echo "'$*'" | sed "s/ /','/g") if vergte "$major" "9.2"; then pidname="pid" else