diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2020-11-05 16:51:30 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-11-05 16:51:30 +0000 |
commit | aeda355b1b6ff45a38b6fb053ccebe1f1ba2995e (patch) | |
tree | a43b980fab340362bddc4ae834895f3b0d471b2e | |
parent | 1319eb99f2e04d463547f4b4b3dfa29882be6d15 (diff) | |
download | freebsd-ports-aeda355b1b6ff45a38b6fb053ccebe1f1ba2995e.zip |
Backout r554139.
-rw-r--r-- | Mk/Scripts/check-desktop-entries.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/check-stagedir.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/check-vulnerable.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/check_leftovers.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/checksum.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/create-manifest.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/depends-list.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/desktop-categories.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/dialog4ports.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/do-depends.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/do-fetch.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/do-patch.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/do-users-groups.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/find-lib.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/generate-symbols.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/install-desktop-entries.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/makesum.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/plist_sub_sed_sort.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/ports_env.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/qa.sh | 2 | ||||
-rw-r--r-- | Mk/Scripts/rust-compat11-canary.sh | 1 | ||||
-rw-r--r-- | Mk/Scripts/smart_makepatch.sh | 2 |
22 files changed, 0 insertions, 29 deletions
diff --git a/Mk/Scripts/check-desktop-entries.sh b/Mk/Scripts/check-desktop-entries.sh index d5cfadb26eea..30025f985916 100644 --- a/Mk/Scripts/check-desktop-entries.sh +++ b/Mk/Scripts/check-desktop-entries.sh @@ -4,7 +4,6 @@ # 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 0de5afe3354c..231affabe58a 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -12,7 +12,6 @@ # 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 7cbc50664568..bb85a118f559 100644 --- a/Mk/Scripts/check-vulnerable.sh +++ b/Mk/Scripts/check-vulnerable.sh @@ -4,7 +4,6 @@ # 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 8e757b63a6e1..56203f9a73e9 100644 --- a/Mk/Scripts/check_leftovers.sh +++ b/Mk/Scripts/check_leftovers.sh @@ -23,8 +23,6 @@ # 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 0e649967d7cf..cde14a831999 100644 --- a/Mk/Scripts/checksum.sh +++ b/Mk/Scripts/checksum.sh @@ -4,7 +4,6 @@ # 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 a95def911893..cb924a03839c 100644 --- a/Mk/Scripts/create-manifest.sh +++ b/Mk/Scripts/create-manifest.sh @@ -4,7 +4,6 @@ # 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 f930305723e2..843bedd03958 100644 --- a/Mk/Scripts/depends-list.sh +++ b/Mk/Scripts/depends-list.sh @@ -3,7 +3,6 @@ # $FreeBSD$ set -e -set pipefail . ${dp_SCRIPTSDIR}/functions.sh diff --git a/Mk/Scripts/desktop-categories.sh b/Mk/Scripts/desktop-categories.sh index 7f6d584f11b6..14d9b9643ac1 100644 --- a/Mk/Scripts/desktop-categories.sh +++ b/Mk/Scripts/desktop-categories.sh @@ -4,7 +4,6 @@ # 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 afd332bec27a..61b855ee44b8 100644 --- a/Mk/Scripts/dialog4ports.sh +++ b/Mk/Scripts/dialog4ports.sh @@ -2,7 +2,6 @@ # $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 2dbd1b81d4c5..2185faebe6dd 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -4,7 +4,6 @@ # 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 4e1c8f7f229a..7772f3b382bd 100644 --- a/Mk/Scripts/do-fetch.sh +++ b/Mk/Scripts/do-fetch.sh @@ -4,7 +4,6 @@ # 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 814efc72c326..f880738ea367 100644 --- a/Mk/Scripts/do-patch.sh +++ b/Mk/Scripts/do-patch.sh @@ -4,7 +4,6 @@ # 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 aaa3e37fe9b3..95c3d9a4c999 100644 --- a/Mk/Scripts/do-users-groups.sh +++ b/Mk/Scripts/do-users-groups.sh @@ -4,7 +4,6 @@ # 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 c7bafcd12d55..3e3c523fe042 100644 --- a/Mk/Scripts/find-lib.sh +++ b/Mk/Scripts/find-lib.sh @@ -2,8 +2,6 @@ # 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 7d9f4bed4d91..4ebb8c87de24 100644 --- a/Mk/Scripts/generate-symbols.sh +++ b/Mk/Scripts/generate-symbols.sh @@ -9,8 +9,6 @@ # /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 d21bfba5d748..5acb4db84799 100644 --- a/Mk/Scripts/install-desktop-entries.sh +++ b/Mk/Scripts/install-desktop-entries.sh @@ -4,7 +4,6 @@ # 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 a86d1e7cd9fa..a4230905c647 100644 --- a/Mk/Scripts/makesum.sh +++ b/Mk/Scripts/makesum.sh @@ -4,7 +4,6 @@ # 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 234a7fdf29b6..3dbab42183ad 100644 --- a/Mk/Scripts/plist_sub_sed_sort.sh +++ b/Mk/Scripts/plist_sub_sed_sort.sh @@ -5,8 +5,6 @@ # # 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 6433c6c7dc50..7d1d861bf28e 100644 --- a/Mk/Scripts/ports_env.sh +++ b/Mk/Scripts/ports_env.sh @@ -3,8 +3,6 @@ # 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 21e1c3818832..74aa476b0a3c 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -2,8 +2,6 @@ # 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 4777b80710ee..90e74bda0cfc 100644 --- a/Mk/Scripts/rust-compat11-canary.sh +++ b/Mk/Scripts/rust-compat11-canary.sh @@ -2,7 +2,6 @@ # 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 a804d7ba5f4e..286242ba388e 100644 --- a/Mk/Scripts/smart_makepatch.sh +++ b/Mk/Scripts/smart_makepatch.sh @@ -25,8 +25,6 @@ # 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 |