s4
changeset 1032:ae88ca565d08
Add wrapper for GNU m4 and md5sum
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Thu, 28 Dec 2023 11:27:06 +0900 |
parents | 9d62cba7344f |
children | 23e57a7f2bd8 |
files | s4-funcs.sh |
diffstat | 1 files changed, 18 insertions(+), 0 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Wed Dec 27 17:40:34 2023 +0900 1.2 +++ b/s4-funcs.sh Thu Dec 28 11:27:06 2023 +0900 1.3 @@ -476,6 +476,13 @@ 1.4 } 1.5 _m4() { 1.6 #S4NAME=f,f,f 1.7 + if m4 --version | grep -q GNU; then 1.8 + if type om4; then # https://github.com/ibara/m4 1.9 + m4() { 1.10 + om4 "$@" 1.11 + } 1.12 + fi 1.13 + fi >/dev/null 2>&1 1.14 m4 ${S4NAME:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} \ 1.15 ${S4WORLD:+-D_S4WORLD_="$S4WORLD"} \ 1.16 ${S4WORLDNAME:+-D_S4WORLDNAME_="$S4WORLDNAME"} \ 1.17 @@ -485,6 +492,17 @@ 1.18 if ! type gdate && date --version | grep -q GNU; then 1.19 gdate() date "$@" 1.20 fi >/dev/null 2>&1 1.21 +if ! type md5 && type md5sum && md5sum --version | grep -q GNU; then 1.22 + md5() { 1.23 + if [ -z "$1" ]; then 1.24 + md5sum | cut -d' ' -f 1 1.25 + else 1.26 + for f; do 1.27 + printf "MD5 (%s) = %s\n" "$f" "$(md5 < $f)" 1.28 + done 1.29 + fi 1.30 + } 1.31 +fi >/dev/null 2>&1 1.32 ismember() { 1.33 # $1=user, $2=group 1.34 #err ismem: "select user from grp_mem where gname=$(sqlquote $2) and user='$1';"