This is an automated email from the ASF dual-hosted git repository.

agura pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new b821f8d  IGNITE-12367-17424 Disable by default bash 
pipefail/errexit/nounset options from Ignite startup scripts
b821f8d is described below

commit b821f8ddd1c10c1c6dada52e4fc1d9868cbc3fac
Author: Mikhail Cherkasov <[email protected]>
AuthorDate: Tue Nov 12 13:37:16 2019 +0300

    IGNITE-12367-17424 Disable by default bash pipefail/errexit/nounset options 
from Ignite startup scripts
    
    Signed-off-by: Andrey Gura <[email protected]>
---
 bin/control.sh                 | 13 ++++++++-----
 bin/ignite-tf.sh               | 13 ++++++++-----
 bin/ignite.sh                  | 13 ++++++++-----
 bin/ignitevisorcmd.sh          | 13 ++++++++-----
 bin/include/functions.sh       | 13 ++++++++-----
 bin/include/parseargs.sh       | 13 ++++++++-----
 bin/include/setenv.sh          | 13 ++++++++-----
 modules/sqlline/bin/sqlline.sh | 13 ++++++++-----
 packaging/package.sh           | 13 ++++++++-----
 9 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/bin/control.sh b/bin/control.sh
index 0e04686..6396d4a 100755
--- a/bin/control.sh
+++ b/bin/control.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/ignite-tf.sh b/bin/ignite-tf.sh
index 929634b..af2b5d4 100755
--- a/bin/ignite-tf.sh
+++ b/bin/ignite-tf.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/ignite.sh b/bin/ignite.sh
index ee12021..46c6367 100755
--- a/bin/ignite.sh
+++ b/bin/ignite.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 
 #
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index a7cb020..f7ee4e0 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index 21a5310..9e6e65c 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/include/parseargs.sh b/bin/include/parseargs.sh
index 3b4a070..b4493a7 100755
--- a/bin/include/parseargs.sh
+++ b/bin/include/parseargs.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/include/setenv.sh b/bin/include/setenv.sh
index 7290ccd..ef60c40 100755
--- a/bin/include/setenv.sh
+++ b/bin/include/setenv.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh
index 0a2075d..c177cf7 100644
--- a/modules/sqlline/bin/sqlline.sh
+++ b/modules/sqlline/bin/sqlline.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/packaging/package.sh b/packaging/package.sh
index d409052..223e314 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-set -o nounset
-set -o errexit
-set -o pipefail
-set -o errtrace
-set -o functrace
+if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
+then
+    set -o nounset
+    set -o errexit
+    set -o pipefail
+    set -o errtrace
+    set -o functrace
+fi
 
 cd "$(dirname "${BASH_SOURCE[0]}")"    # Run from the script's root
 

Reply via email to