From 86ad624c5aa6d8568946c9ea47c5de88101ee226 Mon Sep 17 00:00:00 2001 From: Kevin Adler Date: Mon, 24 Jan 2022 16:45:48 -0600 Subject: [PATCH] os400: Add function wrapper for system command The wrapper will exit if the system command failed instead of blindly continuing on. In addition, only copy docs which exist, since now the copy failure will cause the build to stop. Closes #8455 --- packages/OS400/initscript.sh | 6 +++++- packages/OS400/makefile.sh | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh index 6897a5de37..93e713cf95 100644 --- a/packages/OS400/initscript.sh +++ b/packages/OS400/initscript.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -21,6 +21,10 @@ # ########################################################################### +system () +{ + /usr/bin/system "$@" || exit 1 +} setenv() diff --git a/packages/OS400/makefile.sh b/packages/OS400/makefile.sh index bfc56da3d6..ab968b22eb 100644 --- a/packages/OS400/makefile.sh +++ b/packages/OS400/makefile.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -59,6 +59,8 @@ do MEMBER="`basename \"${TEXT}\" .OS400`" MEMBER="`basename \"${MEMBER}\" .md`" MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${MEMBER}\"`.MBR" + [ -e "${TEXT}" ] || continue + if action_needed "${MEMBER}" "${TEXT}" then CMD="CPY OBJ('${TEXT}') TOOBJ('${MEMBER}') TOCCSID(${TGTCCSID})" CMD="${CMD} DTAFMT(*TEXT) REPLACE(*YES)" -- 2.47.3