Skip to content

Commit e73a410

Browse files
authored
Used set to make shell scripts more strict (opensearch-project#3278)
* Use set to make shell scripts more strict Signed-off-by: Owais Kazi <owaiskazi19@gmail.com> * Change -o pipefail to -e Signed-off-by: Owais Kazi <owaiskazi19@gmail.com> * Set scripts to standard rule Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
1 parent 4886f8e commit e73a410

File tree

20 files changed

+32
-8
lines changed

20 files changed

+32
-8
lines changed

client/sniffer/src/test/resources/create_test_nodes_info.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# when we do rebuild the files they don't jump around too much. That
1515
# way the diffs are smaller.
1616

17-
set -e
17+
set -e -o pipefail
1818

1919
script_path="$( cd "$(dirname "$0")" ; pwd -P )"
2020
work=$(mktemp -d)

dev-tools/atomic_push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -e
2+
set -e -o pipefail
33

44
if [ "$#" -eq 0 ]; then
55
printf 'Usage: %s <origin> <branch> <branch> ...\n' "$(basename "$0")"

dev-tools/signoff-check.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
2+
3+
set -e -o pipefail
24

35
### Script to check for signoff presents on commits
46

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
set -e -o pipefail
3+
24
cd /usr/share/opensearch/bin/
35

46
/usr/local/bin/docker-entrypoint.sh | tee > /usr/share/opensearch/logs/console.log

distribution/docker/src/docker/bin/docker-entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -e
2+
set -e -o pipefail
33

44
# Files created by Elasticsearch should always be group writable too
55
umask 0002

distribution/packages/src/common/scripts/preinst

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# $1=1 : indicates an new install
1111
# $1=2 : indicates an upgrade
1212

13+
set -e -o pipefail
14+
1315
err_exit() {
1416
echo "$@" >&2
1517
exit 1

distribution/packages/src/common/systemd/systemd-entrypoint

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# This wrapper script allows SystemD to feed a file containing a passphrase into
44
# the main OpenSearch startup script
55

6+
set -e -o pipefail
7+
68
if [ -n "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE" ] ; then
79
exec /usr/share/opensearch/bin/opensearch "$@" < "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE"
810
else

distribution/packages/src/deb/init.d/opensearch

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# Description: Starts opensearch using start-stop-daemon
1313
### END INIT INFO
1414

15+
set -e -o pipefail
16+
1517
PATH=/bin:/usr/bin:/sbin:/usr/sbin
1618
NAME=opensearch
1719
DESC="OpenSearch Server"

distribution/packages/src/rpm/init.d/opensearch

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
# Description: OpenSearch is a very scalable, schema-free and high-performance search solution supporting multi-tenancy and near realtime search.
1717
### END INIT INFO
1818

19+
set -e -o pipefail
20+
1921
#
2022
# init.d / servicectl compatibility (openSUSE)
2123
#

distribution/src/bin/opensearch

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#
1414
# OPENSEARCH_JAVA_OPTS="-Xms8g -Xmx8g" ./bin/opensearch
1515

16+
set -e -o pipefail
17+
1618
source "`dirname "$0"`"/opensearch-env
1719

1820
CHECK_KEYSTORE=true

distribution/src/bin/opensearch-keystore

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e -o pipefail
4+
35
OPENSEARCH_MAIN_CLASS=org.opensearch.common.settings.KeyStoreCli \
46
OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/keystore-cli \
57
"`dirname "$0"`"/opensearch-cli \

distribution/src/bin/opensearch-node

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -e -o pipefail
23

34
OPENSEARCH_MAIN_CLASS=org.opensearch.cluster.coordination.NodeToolCli \
45
"`dirname "$0"`"/opensearch-cli \

distribution/src/bin/opensearch-plugin

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e -o pipefail
4+
35
OPENSEARCH_MAIN_CLASS=org.opensearch.plugins.PluginCli \
46
OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli \
57
"`dirname "$0"`"/opensearch-cli \

distribution/src/bin/opensearch-shard

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e -o pipefail
4+
35
OPENSEARCH_MAIN_CLASS=org.opensearch.index.shard.ShardToolCli \
46
"`dirname "$0"`"/opensearch-cli \
57
"$@"

distribution/src/bin/opensearch-upgrade

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -e -o pipefail
23

34
OPENSEARCH_MAIN_CLASS=org.opensearch.upgrade.UpgradeCli \
45
OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/upgrade-cli \

qa/remote-clusters/docker-test-entrypoint.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
set -e -o pipefail
3+
24
cd /usr/share/opensearch/bin/
35
./opensearch-users useradd rest_user -p test-password -r superuser || true
46
echo "testnode" > /tmp/password

test/fixtures/krb5kdc-fixture/src/main/resources/provision/addprinc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
set -e
20+
set -e -o pipefail
2121

2222
krb5kdc
2323
kadmind

test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# GitHub history for details.
1111
#
1212

13-
set -e
13+
set -e -o pipefail
1414

1515
addprinc.sh "opensearch"
1616
#TODO(OpenSearch): fix username

test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# GitHub history for details.
3030
#
3131

32-
set -e
32+
set -e -o pipefail
3333

3434
# KDC installation steps and considerations based on https://web.mit.edu/kerberos/krb5-latest/doc/admin/install_kdc.html
3535
# and helpful input from https://help.ubuntu.com/community/Kerberos

test/fixtures/krb5kdc-fixture/src/main/resources/provision/peppa.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
set -e -o pipefail
44

55
addprinc.sh opensearch
66
addprinc.sh HTTP/localhost

0 commit comments

Comments
 (0)