OS400: post-shellcheck changes adjustments
Build scripts must be executed by the os/400 shell (sh), not bash which
is a PASE program.
Shell function get_make_vars() escaping reworked to match $() subcommand
construct.
Follow-up to 8a622baf9e
Closes #13366
This commit is contained in:
parent
8bac53ecf0
commit
5e46c2909f
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
@ -120,6 +120,7 @@ action_needed()
|
|||||||
{
|
{
|
||||||
[ ! -e "${1}" ] && return 0
|
[ ! -e "${1}" ] && return 0
|
||||||
[ -n "${2}" ] || return 1
|
[ -n "${2}" ] || return 1
|
||||||
|
# shellcheck disable=SC3013
|
||||||
[ "${1}" -ot "${2}" ] && return 0
|
[ "${1}" -ot "${2}" ] && return 0
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
@ -276,15 +277,16 @@ get_make_vars()
|
|||||||
|
|
||||||
{
|
{
|
||||||
eval "$(sed -e ': begin' \
|
eval "$(sed -e ': begin' \
|
||||||
-e '/\\\\$/{' \
|
-e '/\\$/{' \
|
||||||
-e 'N' \
|
-e 'N' \
|
||||||
-e 's/\\\\\\n/ /' \
|
-e 's/\\\n/ /' \
|
||||||
-e 'b begin' \
|
-e 'b begin' \
|
||||||
-e '}' \
|
-e '}' \
|
||||||
-e '/^[A-Za-z_][A-Za-z0-9_]*[[:space:]]*=/!d' \
|
-e 's/[[:space:]][[:space:]]*/ /g' \
|
||||||
-e 's/@\\([A-Za-z0-9_]*\\)@/${\\1}/g' \
|
-e '/^[A-Za-z_][A-Za-z0-9_]* *=/!d' \
|
||||||
-e 's/[[:space:]]*=[[:space:]]*/=/' \
|
-e 's/@\([A-Za-z0-9_]*\)@/${\1}/g' \
|
||||||
-e 's/=\\(.*[^[:space:]]\\)[[:space:]]*$/=\\"\\1\\"/' \
|
-e 's/ *= */=/' \
|
||||||
-e 's/\\\$(\\([^)]*\\))/\${\\1}/g' \
|
-e 's/=\(.*[^ ]\) *$/="\1"/' \
|
||||||
< \""${1}"\")"
|
-e 's/\$(\([^)]*\))/${\1}/g' \
|
||||||
|
< "${1}")"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
@ -104,10 +104,10 @@ build_all_programs()
|
|||||||
|
|
||||||
if [ -n "${LINK}" ]
|
if [ -n "${LINK}" ]
|
||||||
then PGMLDADD="$(eval echo "\${${PGM}_LDADD}")"
|
then PGMLDADD="$(eval echo "\${${PGM}_LDADD}")"
|
||||||
for ARG in ${PGMLDADD}
|
for M in ${PGMLDADD}
|
||||||
do case "${ARG}" in
|
do case "${M}" in
|
||||||
-*) ;; # Ignore non-module.
|
-*) ;; # Ignore non-module.
|
||||||
*) MODULES="${MODULES} $(db2_name "${ARG}")"
|
*) MODULES="${MODULES} $(db2_name "${M}")"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# _ _ ____ _
|
# _ _ ____ _
|
||||||
# Project ___| | | | _ \| |
|
# Project ___| | | | _ \| |
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user