Skip to content

Commit 7abcb48

Browse files
authored
ansible: fix SC2268 errors (#4118)
1 parent 66bb688 commit 7abcb48

7 files changed

Lines changed: 17 additions & 17 deletions

File tree

ansible/www-standalone/resources/scripts/queue-cdn-purge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
site=$1
66

7-
if [ "X$site" != "Xiojs" ] && [ "X$site" != "Xnodejs" ]; then
7+
if [ "$site" != "iojs" ] && [ "$site" != "nodejs" ]; then
88
echo "Usage: queue-cdn-purge.sh < iojs | nodejs > [reason]"
99
exit 1
1010
fi

ansible/www-standalone/tools/promote/_promote.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ for subdir in $(cd $srcdir && ls); do
2828
if [ -d "${srcdir}/${subdir}" ] && [[ $subdir =~ $dirmatch ]]; then
2929
resha=no
3030

31-
if [ "X${version}" != "X" ] && [ "X${version}" != "X${subdir}" ]; then
31+
if [ "${version}" != "" ] && [ "${version}" != "${subdir}" ]; then
3232
continue
3333
fi
3434

@@ -49,7 +49,7 @@ for subdir in $(cd $srcdir && ls); do
4949

5050
done
5151

52-
if [ "X${version}" == "X" ] && [ "$resha" == "yes" ]; then
52+
if [ -z "${version}" ] && [ "$resha" == "yes" ]; then
5353
${__dirname}/_resha.sh $site $srcdir $dstdir $subdir
5454
. ${__dirname}/upload_to_cloudflare.sh $site $subdir
5555
fi

ansible/www-standalone/tools/promote/_resha.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ version=$4
1010
__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1111
. ${__dirname}/settings
1212

13-
if [ "X${site}" == "X" ]; then
13+
if [ -z "$site" ]; then
1414
echo "site argument not provided"
1515
exit 1
1616
fi
1717

18-
if [ "X${srcdir}" == "X" ]; then
18+
if [ -z "$srcdir" ]; then
1919
echo "srcdir argument not provided"
2020
exit 1
2121
fi
2222

23-
if [ "X${dstdir}" == "X" ]; then
23+
if [ -z "$dstdir" ]; then
2424
echo "dstdir argument not provided"
2525
exit 1
2626
fi
2727

28-
if [ "X${version}" == "X" ]; then
28+
if [ -z "$version" ]; then
2929
echo "version argument not provided"
3030
exit 1
3131
fi

ansible/www-standalone/tools/promote/promote_nightly.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ site=$1
66

77
__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
88

9-
if [ "X$site" != "Xiojs" ] && [ "X$site" != "Xnodejs" ]; then
9+
if [ "$site" != "iojs" ] && [ "$site" != "nodejs" ]; then
1010
echo "Usage: promote_nightly.sh < iojs | nodejs >"
1111
exit 1
1212
fi

ansible/www-standalone/tools/promote/promote_release.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ site=$1
66

77
__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
88

9-
if [ "X$site" != "Xiojs" ] && [ "X$site" != "Xnodejs" ]; then
9+
if [ "$site" != "iojs" ] && [ "$site" != "nodejs" ]; then
1010
echo "Usage: promote_release.sh < iojs | nodejs > <version>"
1111
exit 1
1212
fi
1313

14-
if [ "X$2" == "X" ]; then
14+
if [ -z "$2" ]; then
1515
echo "Usage: promote_release.sh < iojs | nodejs > <version>"
1616
exit 1
1717
fi
@@ -34,12 +34,12 @@ while true; do
3434
yorn=""
3535
read yorn
3636

37-
if [ "X${yorn}" == "Xn" ]; then
37+
if [ "${yorn}" == "n" ]; then
3838
echo "Bailing out ..."
3939
exit 1
4040
fi
4141

42-
if [ "X${yorn}" == "Xy" ]; then
42+
if [ "${yorn}" == "y" ]; then
4343
. ${__dirname}/_promote.sh $site $2
4444
nodejs-latest-linker /home/dist/${site}/release/ /home/dist/${site}/docs/
4545
break

ansible/www-standalone/tools/promote/resha_release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ site=$1
44

55
__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
66

7-
if [ "X$site" != "Xiojs" ] && [ "X$site" != "Xnodejs" ]; then
7+
if [ "$site" != "iojs" ] && [ "$site" != "nodejs" ]; then
88
echo "Usage: resha_release.sh < iojs | nodejs > <version>"
99
exit 1
1010
fi
1111

12-
if [ "X$2" == "X" ]; then
12+
if [ -z "$2" ]; then
1313
echo "Usage: resha_release.sh < iojs | nodejs > <version>"
1414
exit 1
1515
fi
@@ -19,7 +19,7 @@ fi
1919
srcdir=$release_srcdir
2020
dstdir=$release_dstdir
2121

22-
if [ "X${1}" == "X" ]; then
22+
if [ -z "$1" ]; then
2323
echo "Please provide a version string"
2424
exit 1
2525
fi

ansible/www-standalone/tools/promote/upload_to_cloudflare.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ set -e
44

55
site=$1
66

7-
if [ "X$site" != "Xiojs" ] && [ "X$site" != "Xnodejs" ]; then
7+
if [ "$site" != "iojs" ] && [ "$site" != "nodejs" ]; then
88
echo "Usage: upload_to_cloudflare.sh < iojs | nodejs > <version>"
99
exit 1
1010
fi
1111

12-
if [ "X$2" == "X" ]; then
12+
if [ -z "$2" ]; then
1313
echo "Usage: upload_to_cloudflare.sh < iojs | nodejs > <version>"
1414
exit 1
1515
fi

0 commit comments

Comments
 (0)