From 3b19944e07824b5cf1feb44c3989c3b4e816d756 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Tue, 19 Jan 2021 22:35:41 +0000 Subject: [PATCH] tweak for compat with broken /bin/sh on AIX ibm.risc AIX on ibm.risc comes with a broken version of ksh88 as /bin/sh where the following causes breakage in the parser (spurious syntax errors): (set -o posix) 2>/dev/null && set -o posix However, prefixing it with 'command' (while keeping the subshell) circumvents the problem. So, why not. (command set -o posix) 2>/dev/null && set -o posix --- src/cmd/INIT/crossexec.sh | 2 +- src/cmd/INIT/execrate.sh | 2 +- src/cmd/INIT/filter.sh | 2 +- src/cmd/INIT/hurl.sh | 2 +- src/cmd/INIT/iffe.sh | 2 +- src/cmd/INIT/ignore.sh | 2 +- src/cmd/INIT/mamprobe.sh | 2 +- src/cmd/INIT/mkdir.sh | 2 +- src/cmd/INIT/package.sh | 2 +- src/cmd/INIT/silent.sh | 2 +- src/cmd/ksh93/features/math.sh | 2 +- src/lib/libast/comp/conf.sh | 2 +- src/lib/libast/features/libpath.sh | 2 +- src/lib/libast/features/param.sh | 2 +- src/lib/libast/features/preroot.sh | 2 +- src/lib/libast/features/sig.sh | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cmd/INIT/crossexec.sh b/src/cmd/INIT/crossexec.sh index 3fab299c4..cedbccf8c 100644 --- a/src/cmd/INIT/crossexec.sh +++ b/src/cmd/INIT/crossexec.sh @@ -19,7 +19,7 @@ ######################################################################## : cross compiler a.out execution -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=crossexec diff --git a/src/cmd/INIT/execrate.sh b/src/cmd/INIT/execrate.sh index ec142b6ef..50735dcc9 100644 --- a/src/cmd/INIT/execrate.sh +++ b/src/cmd/INIT/execrate.sh @@ -19,7 +19,7 @@ ######################################################################## : wrapper for .exe challenged win32 systems/commands -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=execrate diff --git a/src/cmd/INIT/filter.sh b/src/cmd/INIT/filter.sh index f1f524dca..f1c70448e 100644 --- a/src/cmd/INIT/filter.sh +++ b/src/cmd/INIT/filter.sh @@ -19,7 +19,7 @@ ######################################################################## : convert command that operates on file args to pipeline filter -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=filter diff --git a/src/cmd/INIT/hurl.sh b/src/cmd/INIT/hurl.sh index 1290a4b83..a1da1eac0 100644 --- a/src/cmd/INIT/hurl.sh +++ b/src/cmd/INIT/hurl.sh @@ -19,7 +19,7 @@ ######################################################################## : copy http url data -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=hurl agent="$command/2009-01-20 (AT&T Research)" diff --git a/src/cmd/INIT/iffe.sh b/src/cmd/INIT/iffe.sh index 699ff7431..a802f9497 100644 --- a/src/cmd/INIT/iffe.sh +++ b/src/cmd/INIT/iffe.sh @@ -25,7 +25,7 @@ # # NOTE: .exe a.out suffix and [\\/] in path patterns for dos/nt -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=iffe version=2012-07-17 # update in USAGE too # diff --git a/src/cmd/INIT/ignore.sh b/src/cmd/INIT/ignore.sh index 88e31093e..09611b70b 100644 --- a/src/cmd/INIT/ignore.sh +++ b/src/cmd/INIT/ignore.sh @@ -20,7 +20,7 @@ # non-ksh script for the nmake ignore prefix # @(#)ignore (AT&T Research) 1992-08-11 -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix modern_export=`v=; export v=ok 2>/dev/null; echo "$v"` while : diff --git a/src/cmd/INIT/mamprobe.sh b/src/cmd/INIT/mamprobe.sh index e5166f47d..d3f513fc9 100644 --- a/src/cmd/INIT/mamprobe.sh +++ b/src/cmd/INIT/mamprobe.sh @@ -21,7 +21,7 @@ # mamprobe - generate MAM cc probe info # Glenn Fowler -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix command=mamprobe diff --git a/src/cmd/INIT/mkdir.sh b/src/cmd/INIT/mkdir.sh index e6fe0cf34..78830f1e9 100644 --- a/src/cmd/INIT/mkdir.sh +++ b/src/cmd/INIT/mkdir.sh @@ -20,7 +20,7 @@ ######################################################################## : mkdir for systems that do not support -p : 2002-09-01 : -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix MKDIR=mkdir CHMOD=chmod diff --git a/src/cmd/INIT/package.sh b/src/cmd/INIT/package.sh index f792daf29..c4bef60c9 100644 --- a/src/cmd/INIT/package.sh +++ b/src/cmd/INIT/package.sh @@ -23,7 +23,7 @@ command=package -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix path=Bad case $PATH in Bad*) echo "Cannot be run by zsh in native mode; use a sh symlink to zsh" >&2 diff --git a/src/cmd/INIT/silent.sh b/src/cmd/INIT/silent.sh index e3c148eed..77e85333b 100644 --- a/src/cmd/INIT/silent.sh +++ b/src/cmd/INIT/silent.sh @@ -20,7 +20,7 @@ # non-ksh stub for the nmake silent prefix # @(#)silent (AT&T Research) 1992-08-11 -(set -o posix) 2>/dev/null && set -o posix +(command set -o posix) 2>/dev/null && set -o posix modern_export=`v=; export v=ok 2>/dev/null; echo "$v"` while : diff --git a/src/cmd/ksh93/features/math.sh b/src/cmd/ksh93/features/math.sh index 2f95d0fbc..660e23b1c 100644 --- a/src/cmd/ksh93/features/math.sh +++ b/src/cmd/ksh93/features/math.sh @@ -24,7 +24,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac command=$0 diff --git a/src/lib/libast/comp/conf.sh b/src/lib/libast/comp/conf.sh index b87eae05a..72b1bfff4 100644 --- a/src/lib/libast/comp/conf.sh +++ b/src/lib/libast/comp/conf.sh @@ -36,7 +36,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac LC_ALL=C diff --git a/src/lib/libast/features/libpath.sh b/src/lib/libast/features/libpath.sh index dc29fca49..40c6aed7c 100644 --- a/src/lib/libast/features/libpath.sh +++ b/src/lib/libast/features/libpath.sh @@ -22,7 +22,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac ok=0 diff --git a/src/lib/libast/features/param.sh b/src/lib/libast/features/param.sh index 83878f352..4cb538752 100644 --- a/src/lib/libast/features/param.sh +++ b/src/lib/libast/features/param.sh @@ -23,7 +23,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac case $# in diff --git a/src/lib/libast/features/preroot.sh b/src/lib/libast/features/preroot.sh index 247eb4303..d1e7922e5 100644 --- a/src/lib/libast/features/preroot.sh +++ b/src/lib/libast/features/preroot.sh @@ -23,7 +23,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac case $# in diff --git a/src/lib/libast/features/sig.sh b/src/lib/libast/features/sig.sh index 93e33ef9e..9448c29cc 100644 --- a/src/lib/libast/features/sig.sh +++ b/src/lib/libast/features/sig.sh @@ -23,7 +23,7 @@ case $ZSH_VERSION in ?*) emulate ksh ;; -*) (set -o posix) 2>/dev/null && set -o posix ;; +*) (command set -o posix) 2>/dev/null && set -o posix ;; esac case $# in