Change -o pipefail to -e

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
opensearch-project · May 11, 2022 · c285109 · c285109
1 parent 10fad09
commit c285109
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 23 deletions.
diff --git a/client/sniffer/src/test/resources/create_test_nodes_info.bash b/client/sniffer/src/test/resources/create_test_nodes_info.bash
@@ -14,7 +14,7 @@
 # when we do rebuild the files they don't jump around too much. That
 # way the diffs are smaller.
 
-set -e -o pipefail
+set -e
 
 script_path="$( cd "$(dirname "$0")" ; pwd -P )"
 work=$(mktemp -d)

diff --git a/dev-tools/atomic_push.sh b/dev-tools/atomic_push.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 if [ "$#" -eq 0 ]; then
     printf 'Usage: %s <origin> <branch> <branch> ...\n' "$(basename "$0")"

diff --git a/dev-tools/signoff-check.sh b/dev-tools/signoff-check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e -o pipefail
+set -e
 
 ### Script to check for signoff presents on commits
 

diff --git a/distribution/docker/docker-test-entrypoint.sh b/distribution/docker/docker-test-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 cd /usr/share/opensearch/bin/
 

diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 # Files created by Elasticsearch should always be group writable too
 umask 0002

diff --git a/distribution/packages/src/common/scripts/preinst b/distribution/packages/src/common/scripts/preinst
@@ -10,7 +10,7 @@
 #       $1=1       : indicates an new install
 #       $1=2       : indicates an upgrade
 
-set -e -o pipefail
+set -e
 
 err_exit() {
     echo "$@" >&2

diff --git a/distribution/packages/src/common/systemd/systemd-entrypoint b/distribution/packages/src/common/systemd/systemd-entrypoint
@@ -3,7 +3,7 @@
 # This wrapper script allows SystemD to feed a file containing a passphrase into
 # the main OpenSearch startup script
 
-set -e -o pipefail
+set -e
 
 if [ -n "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE" ] ; then
   exec /usr/share/opensearch/bin/opensearch "$@" < "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE"

diff --git a/distribution/packages/src/deb/init.d/opensearch b/distribution/packages/src/deb/init.d/opensearch
@@ -12,7 +12,7 @@
 # Description:       Starts opensearch using start-stop-daemon
 ### END INIT INFO
 
-set -e -o pipefail
+set -e
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=opensearch

diff --git a/distribution/packages/src/rpm/init.d/opensearch b/distribution/packages/src/rpm/init.d/opensearch
@@ -16,7 +16,7 @@
 # Description: OpenSearch is a very scalable, schema-free and high-performance search solution supporting multi-tenancy and near realtime search.
 ### END INIT INFO
 
-set -e -o pipefail
+set -e
 
 #
 # init.d / servicectl compatibility (openSUSE)

diff --git a/distribution/src/bin/opensearch b/distribution/src/bin/opensearch
@@ -13,7 +13,7 @@
 #
 #   OPENSEARCH_JAVA_OPTS="-Xms8g -Xmx8g" ./bin/opensearch
 
-set -e -o pipefail
+set -e
 
 source "`dirname "$0"`"/opensearch-env
 

diff --git a/distribution/src/bin/opensearch-cli b/distribution/src/bin/opensearch-cli
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 source "`dirname "$0"`"/opensearch-env
 

diff --git a/distribution/src/bin/opensearch-env b/distribution/src/bin/opensearch-env
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 CDPATH=""
 

diff --git a/distribution/src/bin/opensearch-env-from-file b/distribution/src/bin/opensearch-env-from-file
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 # Allow environment variables to be set by creating a file with the
 # contents, and setting an environment variable with the suffix _FILE to

diff --git a/distribution/src/bin/opensearch-keystore b/distribution/src/bin/opensearch-keystore
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.common.settings.KeyStoreCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/keystore-cli \

diff --git a/distribution/src/bin/opensearch-node b/distribution/src/bin/opensearch-node
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.cluster.coordination.NodeToolCli \
   "`dirname "$0"`"/opensearch-cli \

diff --git a/distribution/src/bin/opensearch-plugin b/distribution/src/bin/opensearch-plugin
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.plugins.PluginCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli \

diff --git a/distribution/src/bin/opensearch-shard b/distribution/src/bin/opensearch-shard
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.index.shard.ShardToolCli \
   "`dirname "$0"`"/opensearch-cli \

diff --git a/distribution/src/bin/opensearch-upgrade b/distribution/src/bin/opensearch-upgrade
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.upgrade.UpgradeCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/upgrade-cli \

diff --git a/qa/remote-clusters/docker-test-entrypoint.sh b/qa/remote-clusters/docker-test-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 cd /usr/share/opensearch/bin/
 ./opensearch-users useradd rest_user -p test-password -r superuser || true

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/addprinc.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/addprinc.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -e -o pipefail
+set -e
 
 krb5kdc
 kadmind

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh
@@ -10,7 +10,7 @@
 # GitHub history for details.
 #
 
-set -e -o pipefail
+set -e
 
 addprinc.sh "opensearch"
 #TODO(OpenSearch): fix username

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh
@@ -29,7 +29,7 @@
 # GitHub history for details.
 #
 
-set -e -o pipefail
+set -e
 
 # KDC installation steps and considerations based on https://web.mit.edu/kerberos/krb5-latest/doc/admin/install_kdc.html
 # and helpful input from https://help.ubuntu.com/community/Kerberos

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/peppa.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/peppa.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail
+set -e
 
 addprinc.sh opensearch
 addprinc.sh HTTP/localhost
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     #
     #   OPENSEARCH_JAVA_OPTS="-Xms8g -Xmx8g" ./bin/opensearch
-    set -e -o pipefail
+    set -e
     source "`dirname "$0"`"/opensearch-env
@@ Expand Down @@