22 files changed, 29 insertions, 0 deletions

diff --git a/Mk/Scripts/check-desktop-entries.sh b/Mk/Scripts/check-desktop-entries.sh
index 30025f985916..d5cfadb26eea 100644
--- a/Mk/Scripts/check-desktop-entries.sh
+++ b/Mk/Scripts/check-desktop-entries.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index 231affabe58a..0de5afe3354c 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -12,6 +12,7 @@
 #  c. Files in plist which are owned by dependencies/MTREEs
 
 set -e
+set pipefail
 
 . ${SCRIPTSDIR}/functions.sh
 
diff --git a/Mk/Scripts/check-vulnerable.sh b/Mk/Scripts/check-vulnerable.sh
index bb85a118f559..7cbc50664568 100644
--- a/Mk/Scripts/check-vulnerable.sh
+++ b/Mk/Scripts/check-vulnerable.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/check_leftovers.sh b/Mk/Scripts/check_leftovers.sh
index 56203f9a73e9..8e757b63a6e1 100644
--- a/Mk/Scripts/check_leftovers.sh
+++ b/Mk/Scripts/check_leftovers.sh
@@ -23,6 +23,8 @@
 # The PLIST_SUB feature can be disabled by setting PLIST_SUB_SED=
 # in environment.
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_CHECK_LEFTOVERS}" ] && set -x
 
 origin="$1"
diff --git a/Mk/Scripts/checksum.sh b/Mk/Scripts/checksum.sh
index cde14a831999..0e649967d7cf 100644
--- a/Mk/Scripts/checksum.sh
+++ b/Mk/Scripts/checksum.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh
index cb924a03839c..a95def911893 100644
--- a/Mk/Scripts/create-manifest.sh
+++ b/Mk/Scripts/create-manifest.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh
index 843bedd03958..f930305723e2 100644
--- a/Mk/Scripts/depends-list.sh
+++ b/Mk/Scripts/depends-list.sh
@@ -3,6 +3,7 @@
 # $FreeBSD$
 
 set -e
+set pipefail
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
diff --git a/Mk/Scripts/desktop-categories.sh b/Mk/Scripts/desktop-categories.sh
index 14d9b9643ac1..7f6d584f11b6 100644
--- a/Mk/Scripts/desktop-categories.sh
+++ b/Mk/Scripts/desktop-categories.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/dialog4ports.sh b/Mk/Scripts/dialog4ports.sh
index 61b855ee44b8..afd332bec27a 100644
--- a/Mk/Scripts/dialog4ports.sh
+++ b/Mk/Scripts/dialog4ports.sh
@@ -2,6 +2,7 @@
 # $FreeBSD$
 # Maintainer: portmgr@FreeBSD.org
 set -e
+set pipefail
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DIALOG4PORTS}" ] && set -x
 
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 2185faebe6dd..2dbd1b81d4c5 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
diff --git a/Mk/Scripts/do-fetch.sh b/Mk/Scripts/do-fetch.sh
index 7772f3b382bd..4e1c8f7f229a 100644
--- a/Mk/Scripts/do-fetch.sh
+++ b/Mk/Scripts/do-fetch.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/do-patch.sh b/Mk/Scripts/do-patch.sh
index f880738ea367..814efc72c326 100644
--- a/Mk/Scripts/do-patch.sh
+++ b/Mk/Scripts/do-patch.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/do-users-groups.sh b/Mk/Scripts/do-users-groups.sh
index 95c3d9a4c999..aaa3e37fe9b3 100644
--- a/Mk/Scripts/do-users-groups.sh
+++ b/Mk/Scripts/do-users-groups.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/find-lib.sh b/Mk/Scripts/find-lib.sh
index 3e3c523fe042..c7bafcd12d55 100644
--- a/Mk/Scripts/find-lib.sh
+++ b/Mk/Scripts/find-lib.sh
@@ -2,6 +2,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_FIND_LIB}" ] && set -x
 
 if [ -z "${LIB_DIRS}" -o -z "${LOCALBASE}" ]; then
diff --git a/Mk/Scripts/generate-symbols.sh b/Mk/Scripts/generate-symbols.sh
index 4ebb8c87de24..7d9f4bed4d91 100644
--- a/Mk/Scripts/generate-symbols.sh
+++ b/Mk/Scripts/generate-symbols.sh
@@ -9,6 +9,8 @@
 # /usr/local/bin/ssh    -> /usr/local/lib/debug/usr/local/bin/ssh.debug
 LIB_DIR_PREFIX="${LOCALBASE}/lib/debug"
 
+set pipefail
+
 msg() {
         echo "====> $*"
 }
diff --git a/Mk/Scripts/install-desktop-entries.sh b/Mk/Scripts/install-desktop-entries.sh
index 5acb4db84799..d21bfba5d748 100644
--- a/Mk/Scripts/install-desktop-entries.sh
+++ b/Mk/Scripts/install-desktop-entries.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/makesum.sh b/Mk/Scripts/makesum.sh
index a4230905c647..a86d1e7cd9fa 100644
--- a/Mk/Scripts/makesum.sh
+++ b/Mk/Scripts/makesum.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
diff --git a/Mk/Scripts/plist_sub_sed_sort.sh b/Mk/Scripts/plist_sub_sed_sort.sh
index 3dbab42183ad..234a7fdf29b6 100644
--- a/Mk/Scripts/plist_sub_sed_sort.sh
+++ b/Mk/Scripts/plist_sub_sed_sort.sh
@@ -5,6 +5,8 @@
 #
 # PLIST_SUB_SED helper to sort by longest value first.
 
+set pipefail
+
 awk '{
 	while (match($0, /s![^!]*![^!]*!g;/)) {
 		sedp=substr($0, RSTART, RLENGTH)
diff --git a/Mk/Scripts/ports_env.sh b/Mk/Scripts/ports_env.sh
index 7d1d861bf28e..6433c6c7dc50 100644
--- a/Mk/Scripts/ports_env.sh
+++ b/Mk/Scripts/ports_env.sh
@@ -3,6 +3,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 if [ -z "${SCRIPTSDIR}" ]; then
 	echo "Must set SCRIPTSDIR" >&2
 	exit 1
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index 74aa476b0a3c..21e1c3818832 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -2,6 +2,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 if [ -z "${STAGEDIR}" -o -z "${PREFIX}" -o -z "${LOCALBASE}" ]; then
 	echo "STAGEDIR, PREFIX, LOCALBASE required in environment." >&2
 	exit 1
diff --git a/Mk/Scripts/rust-compat11-canary.sh b/Mk/Scripts/rust-compat11-canary.sh
index 90e74bda0cfc..4777b80710ee 100644
--- a/Mk/Scripts/rust-compat11-canary.sh
+++ b/Mk/Scripts/rust-compat11-canary.sh
@@ -2,6 +2,7 @@
 # MAINTAINER: rust@FreeBSD.org
 # $FreeBSD$
 set -eu
+set pipefail
 
 if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
 	exit 0
diff --git a/Mk/Scripts/smart_makepatch.sh b/Mk/Scripts/smart_makepatch.sh
index 286242ba388e..a804d7ba5f4e 100644
--- a/Mk/Scripts/smart_makepatch.sh
+++ b/Mk/Scripts/smart_makepatch.sh
@@ -25,6 +25,8 @@
 # if those targets modify source files (e.g. with sed).  You may also
 # want to disable EXTRA_PATCHES as well if that is being used.
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_SMART_MAKEPATCH}" ] && set -x
 
 if [ -z "${PATCHDIR}" -o -z "${PATCH_WRKSRC}" -o -z "${WRKDIR}" ]; then