summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2016-11-01 16:59:54 +0100
committerMartin Babinsky <mbabinsk@redhat.com>2016-11-09 13:08:32 +0100
commitf95098b2b645a62497dc6e1d66be2b7397567d25 (patch)
tree3f765f99e725e84bb5cfba8505096fc7af5fb04d
parent021a52d6801b74ded03cfdf6c7fb73bd1cab978f (diff)
downloadfreeipa-f95098b2b645a62497dc6e1d66be2b7397567d25.tar.gz
freeipa-f95098b2b645a62497dc6e1d66be2b7397567d25.tar.xz
freeipa-f95098b2b645a62497dc6e1d66be2b7397567d25.zip
Build: stop build when a step in web UI build fails
https://fedorahosted.org/freeipa/ticket/6418 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rwxr-xr-xinstall/ui/util/build.sh1
-rwxr-xr-xinstall/ui/util/change-profile.sh3
-rwxr-xr-xinstall/ui/util/clean.sh3
-rwxr-xr-xinstall/ui/util/compile.sh1
-rwxr-xr-xinstall/ui/util/make-builder.sh3
-rwxr-xr-xinstall/ui/util/make-css.sh1
-rwxr-xr-xinstall/ui/util/make-dojo.sh3
-rwxr-xr-xinstall/ui/util/make-patternfly.sh1
-rwxr-xr-xinstall/ui/util/make-ui.sh1
-rwxr-xr-xinstall/ui/util/prepare-dojo.sh3
-rwxr-xr-xinstall/ui/util/sync.sh3
11 files changed, 17 insertions, 6 deletions
diff --git a/install/ui/util/build.sh b/install/ui/util/build.sh
index 2e0eb13c8..e7f6172ab 100755
--- a/install/ui/util/build.sh
+++ b/install/ui/util/build.sh
@@ -20,6 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Build script for FreeIPA Web UI
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/install/ui/util/change-profile.sh b/install/ui/util/change-profile.sh
index 676e8ddaf..730cb344a 100755
--- a/install/ui/util/change-profile.sh
+++ b/install/ui/util/change-profile.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
RDIR=$DIR/../release
@@ -139,4 +140,4 @@ pushd $DIR/../js
git update-index --no-assume-unchanged ./dojo
git update-index --no-assume-unchanged ./freeipa
fi
-popd \ No newline at end of file
+popd
diff --git a/install/ui/util/clean.sh b/install/ui/util/clean.sh
index 86a9db051..55a83a613 100755
--- a/install/ui/util/clean.sh
+++ b/install/ui/util/clean.sh
@@ -18,9 +18,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
# Clean after build
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-rm -rf $DIR/../release \ No newline at end of file
+rm -rf $DIR/../release
diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh
index 5c98a66e4..f96da5db4 100755
--- a/install/ui/util/compile.sh
+++ b/install/ui/util/compile.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
RDIR=$DIR/../release
diff --git a/install/ui/util/make-builder.sh b/install/ui/util/make-builder.sh
index a30aa1ed8..5cb9f26ea 100755
--- a/install/ui/util/make-builder.sh
+++ b/install/ui/util/make-builder.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
# Build DOJO builder, overwrites util/build/build.js. Cleans after itself.
@@ -47,4 +48,4 @@ $DIR/clean.sh
# Delete DOJO symbolic links
rm -f $DIR/../src/dojo
-rm -f $DIR/../src/build \ No newline at end of file
+rm -f $DIR/../src/build
diff --git a/install/ui/util/make-css.sh b/install/ui/util/make-css.sh
index e99e55ffe..0091f839e 100755
--- a/install/ui/util/make-css.sh
+++ b/install/ui/util/make-css.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/install/ui/util/make-dojo.sh b/install/ui/util/make-dojo.sh
index 3b864763f..5d244517c 100755
--- a/install/ui/util/make-dojo.sh
+++ b/install/ui/util/make-dojo.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
# Build script for Dojo library
@@ -35,4 +36,4 @@ if [[ $? != 0 ]] ; then
fi
$DIR/compile.sh --release dojo --layer dojo/dojo --output $DIR/../build/dojo/dojo.js
-$DIR/clean.sh \ No newline at end of file
+$DIR/clean.sh
diff --git a/install/ui/util/make-patternfly.sh b/install/ui/util/make-patternfly.sh
index f11f6807a..29a69af03 100755
--- a/install/ui/util/make-patternfly.sh
+++ b/install/ui/util/make-patternfly.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/install/ui/util/make-ui.sh b/install/ui/util/make-ui.sh
index 088fa8c3c..d983bbaa3 100755
--- a/install/ui/util/make-ui.sh
+++ b/install/ui/util/make-ui.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
# Build script for FreeIPA Web UI
diff --git a/install/ui/util/prepare-dojo.sh b/install/ui/util/prepare-dojo.sh
index 78a3d9334..398e9b070 100755
--- a/install/ui/util/prepare-dojo.sh
+++ b/install/ui/util/prepare-dojo.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
#
# This script prepares working enviroment to use dojo toolkit.
@@ -202,4 +203,4 @@ if [[ $UTIL = $YES ]] ; then
fi
fi
-popd # $DOJO_DIR \ No newline at end of file
+popd # $DOJO_DIR
diff --git a/install/ui/util/sync.sh b/install/ui/util/sync.sh
index 6a081fbb3..68d83ade9 100755
--- a/install/ui/util/sync.sh
+++ b/install/ui/util/sync.sh
@@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
RDIR=$DIR/../release
@@ -357,4 +358,4 @@ if [[ $RESTART ]] ; then
echo "Restarting httpd: $HOST"
ssh $HOST "systemctl restart httpd.service"
fi
-fi \ No newline at end of file
+fi