Commit a17b7c2

committed

refactor/robust(cp-into-docker-run): use printf 💪 instead of echo; use if-else instead of &&-||; improve portability(portableReadLink)

NOTE: - the `echo` option(e.g. -e -n) may effect correctness, `printf` is more robust 💪 - about `&&-||` see shell check: https://www.shellcheck.net/wiki/SC2015

1 parent 7d166fe commit a17b7c2Copy full SHA for a17b7c2

File tree

1 file changed

+18

-12

lines changed

bin
- cp-into-docker-run

1 file changed

+18

-12

lines changed

`‎bin/cp-into-docker-run‎`

Lines changed: 18 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,17 @@ readonly PROG_VERSION='2.5.0-dev'`
`17`	`17`	`# util functions`
`18`	`18`	`################################################################################`
`19`	`19`
`20`		`-# NOTE: $'foo' is the escape sequence syntax of bash`
`21`		`-readonly ec=$'033円' # escape char`
`22`		`-readonly eend=$'033円[0m' # escape end`
`23`		`-readonly nl=$'\n' # new line`
`24`		`-`
`25`		`-redEcho() {`
	`20`	`+redPrint() {`
`26`	`21`	`# -t check: is a terminal device?`
`27`		`- [ -t 1 ] && echo "${ec}[1;31m$$eend" \|\| echo "$"`
	`22`	`+ if [ -t 1 ]; then`
	`23`	`+ printf "033円[1;31m%s033円[0m\n" "$*"`
	`24`	`+ else`
	`25`	`+ printf '%s\n' "$*"`
	`26`	`+ fi`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`die() {`
`31`		`- redEcho "Error: $*" 1>&2`
	`30`	`+ redPrint "Error: $*" 1>&2`
`32`	`31`	`exit 1`
`33`	`32`	`}`
`34`	`33`
`@@ -47,10 +46,15 @@ portableReadLink() {`
`47`	`46`	`readlink -f "$file"`
`48`	`47`	`;;`
`49`	`48`	`Darwin*)`
	`49`	`+ local py_args=(-c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$file")`
`50`	`50`	`if command -v greadlink >/dev/null; then`
`51`	`51`	`greadlink -f "$file"`
	`52`	`+ elif command -v python3 >/dev/null; then`
	`53`	`+ python3 "${py_args[@]}"`
	`54`	`+ elif command -v python >/dev/null; then`
	`55`	`+ python "${py_args[@]}"`
`52`	`56`	`else`
`53`		`- python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))'"$file"`
	`57`	`+ die "fail to find command(greadlink/python3/python) for readlink!"`
`54`	`58`	`fi`
`55`	`59`	`;;`
`56`	`60`	`*)`
`@@ -65,7 +69,9 @@ usage() {`
`65`	`69`	`# shellcheck disable=SC2015`
`66`	`70`	`[ "$exit_code" != 0 ] && local -r out=/dev/stderr \|\| local -r out=/dev/stdout`
`67`	`71`
`68`		`- (($# > 0)) && redEcho "$*$nl" >$out`
	`72`	`+ # NOTE: $'foo' is the escape sequence syntax of bash`
	`73`	`+ local nl=$'\n' # new line`
	`74`	`+ (($# > 0)) && redPrint "$*$nl" >$out`
`69`	`75`
`70`	`76`	`cat >$out <<EOF`
`71`	`77`	`Usage: ${PROG} [OPTION]... command [command-args]...`
`@@ -100,7 +106,7 @@ EOF`
`100`	`106`	`}`
`101`	`107`
`102`	`108`	`progVersion() {`
`103`		`- echo "$PROG $PROG_VERSION"`
	`109`	`+ printf'%s\n' "$PROG $PROG_VERSION"`
`104`	`110`	`exit`
`105`	`111`	`}`
`106`	`112`
`@@ -235,7 +241,7 @@ trap cleanupWhenExit EXIT`
`235`	`241`	`########################################`
`236`	`242`
`237`	`243`	`logAndRun() {`
`238`		`- $verbose && echo "[$PROG] $*" 1>&2`
	`244`	`+ $verbose && printf'%s\n' "[$PROG] $*" 1>&2`
`239`	`245`	`"$@"`
`240`	`246`	`}`
`241`	`247`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a17b7c2

File tree

1 file changed

1 file changed

`‎bin/cp-into-docker-run‎`

0 commit comments