diff --git a/tools/copy-common-files.sh b/tools/copy-common-files.sh
index 83da91b91..c4e481014 100644
--- a/tools/copy-common-files.sh
+++ b/tools/copy-common-files.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/import-crowdin.sh b/tools/import-crowdin.sh
index 808eb7e78..1605187b7 100755
--- a/tools/import-crowdin.sh
+++ b/tools/import-crowdin.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-assets.sh b/tools/make-assets.sh
index 1c1188abf..63c190930 100755
--- a/tools/make-assets.sh
+++ b/tools/make-assets.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-browser.sh b/tools/make-browser.sh
index 3df4fdf67..52911a95b 100755
--- a/tools/make-browser.sh
+++ b/tools/make-browser.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index 047146026..32a82e162 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-clean.sh b/tools/make-clean.sh
index 6dc60fe2e..a0a70b86e 100755
--- a/tools/make-clean.sh
+++ b/tools/make-clean.sh
@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
 echo "*** uBlock: Cleaning."
-rm -R dist/build
+rm -Rf dist/build
 echo "*** uBlock: Cleaned."
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index b50eae886..679d30558 100755
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-nodejs.sh b/tools/make-nodejs.sh
index 88778adad..9bbce84f2 100755
--- a/tools/make-nodejs.sh
+++ b/tools/make-nodejs.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-opera.sh b/tools/make-opera.sh
index 0e95e1a41..dae0f81cb 100755
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/make-thunderbird.sh b/tools/make-thunderbird.sh
index 590a2bce9..0cf3cc462 100755
--- a/tools/make-thunderbird.sh
+++ b/tools/make-thunderbird.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment
 
diff --git a/tools/update-submodules.sh b/tools/update-submodules.sh
index 3391f21ab..ee3aed9f2 100755
--- a/tools/update-submodules.sh
+++ b/tools/update-submodules.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 #
 # This script assumes a linux environment