Skip to content

Commit

Permalink
refactor/robust(ap/rp): improve robustness 💪 ; check failure and re…
Browse files Browse the repository at this point in the history
…flect as exit code; improve portability(`portableRelPath/portableReadLink`)

NOTE:

- use `printf` 💪 instead of `echo`; use `if-else` instead of `&&-||`
  - the `echo` option(e.g. -e -n) may effect correctness, `printf` is more robust 💪
- about `&&-||` see shell check:
  https://www.shellcheck.net/wiki/SC2015
  • Loading branch information
oldratlee committed Aug 28, 2023
1 parent e74c20b commit f724c6a
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 44 deletions.
56 changes: 36 additions & 20 deletions bin/ap
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,24 @@ readonly PROG_VERSION='2.5.0-dev'
# util functions
################################################################################

# NOTE: $'foo' is the escape sequence syntax of bash
readonly ec=$'\033' # escape char
readonly eend=$'\033[0m' # escape end
readonly nl=$'\n' # new line

colorEcho() {
colorPrint() {
local color="$1"
shift
# check isatty in bash https://stackoverflow.com/questions/10022323
# if stdout is console, turn on color output.
[ -t 1 ] && echo "${ec}[1;${color}m$*${eend}" || echo "$*"
if [ -t 1 ]; then
printf "\033[1;${color}m%s\033[0m\n" "$*"
else
printf '%s\n' "$*"
fi
}

redEcho() {
colorEcho 31 "$@"
redPrint() {
colorPrint 31 "$*"
}

die() {
redEcho "Error: $*" 1>&2
redPrint "Error: $*" >&2
exit 1
}

Expand All @@ -54,10 +53,15 @@ portableReadLink() {
readlink -f "$file"
;;
Darwin*)
local py_args=(-c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$file")
if command -v greadlink >/dev/null; then
greadlink -f "$file"
elif command -v python3 >/dev/null; then
python3 "${py_args[@]}"
elif command -v python >/dev/null; then
python "${py_args[@]}"
else
python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$file"
die "fail to find command(greadlink/python3/python) to get absolute path!"
fi
;;
*)
Expand All @@ -72,10 +76,12 @@ usage() {
# shellcheck disable=SC2015
[ "$exit_code" != 0 ] && local -r out=/dev/stderr || local -r out=/dev/stdout

(($# > 0)) && redEcho "$*$nl" >$out
# NOTE: $'foo' is the escape sequence syntax of bash
local nl=$'\n' # new line
(($# > 0)) && redPrint "$*$nl" >$out

cat >$out <<EOF
Usage: ${PROG} [OPTION]... ARG...
Usage: ${PROG} [OPTION]... [FILE]...
convert to Absolute Path.
Example:
Expand All @@ -91,7 +97,7 @@ EOF
}

progVersion() {
echo "$PROG $PROG_VERSION"
printf '%s\n' "$PROG $PROG_VERSION"
exit
}

Expand All @@ -115,7 +121,6 @@ while [ $# -gt 0 ]; do
;;
-*)
usage 2 "${PROG}: unrecognized option '$1'"
break
;;
*)
# if not option, treat all follow files as args
Expand All @@ -128,10 +133,21 @@ done
[ ${#files[@]} -eq 0 ] && files=(.)
readonly files

################################################################################
# biz logic
################################################################################

has_error=false

for f in "${files[@]}"; do
! [ -e "$f" ] && {
echo "$f does not exists!"
continue
}
portableReadLink "$f"
if [ -e "$f" ]; then
portableReadLink "$f"
else
redPrint "error: $f does not exists!" >&2
has_error=true
fi
done

if $has_error; then
exit 1
fi
90 changes: 66 additions & 24 deletions bin/rp
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,51 @@ readonly PROG_VERSION='2.5.0-dev'
# util functions
################################################################################

# NOTE: $'foo' is the escape sequence syntax of bash
readonly ec=$'\033' # escape char
readonly eend=$'\033[0m' # escape end
readonly nl=$'\n' # new line

colorEcho() {
colorPrint() {
local color="$1"
shift
# check isatty in bash https://stackoverflow.com/questions/10022323
# if stdout is console, turn on color output.
[ -t 1 ] && echo "${ec}[1;${color}m$*${eend}" || echo "$*"
if [ -t 1 ]; then
printf "\033[1;${color}m%s\033[0m\n" "$*"
else
printf '%s\n' "$*"
fi
}

redPrint() {
colorPrint 31 "$@"
}

die() {
redPrint "Error: $*" >&2
exit 1
}

redEcho() {
colorEcho 31 "$@"
portableRelPath() {
local file="$1" relTo="$2" uname

uname="$(uname)"
case "$uname" in
Linux* | CYGWIN* | MINGW*)
realpath "$f" --relative-to="$relTo"
;;
Darwin*)
local py_args=(-c 'import os, sys; print(os.path.relpath(sys.argv[1], sys.argv[2]))' "$file" "$relTo")
if command -v grealpath >/dev/null; then
grealpath "$f" --relative-to="$relTo"
elif command -v python3 >/dev/null; then
python3 "${py_args[@]}"
elif command -v python >/dev/null; then
python "${py_args[@]}"
else
die "fail to find command(grealpath/python3/python) to get relative path!"
fi
;;
*)
die "NOT support uname($uname)!"
;;
esac
}

usage() {
Expand All @@ -44,15 +74,18 @@ usage() {
# shellcheck disable=SC2015
[ "$exit_code" != 0 ] && local -r out=/dev/stderr || local -r out=/dev/stdout

(($# > 0)) && redEcho "$*$nl" >$out
# NOTE: $'foo' is the escape sequence syntax of bash
local nl=$'\n' # new line
(($# > 0)) && redPrint "$*$nl" >$out

cat >$out <<EOF
Usage: ${PROG} [OPTION]... ARG...
Usage: ${PROG} [OPTION]... [FILE]...
convert to Relative Path.
Example:
${PROG} arg1 arg2
${PROG} */*.py
${PROG} path # relative to current dir
${PROG} path1 relativeToPath
${PROG} */*.c relativeToPath
Options:
-h, --help display this help and exit
Expand All @@ -63,7 +96,7 @@ EOF
}

progVersion() {
echo "$PROG $PROG_VERSION"
printf '%s\n' "$PROG $PROG_VERSION"
exit
}

Expand All @@ -87,7 +120,6 @@ while [ $# -gt 0 ]; do
;;
-*)
usage 2 "${PROG}: unrecognized option '$1'"
break
;;
*)
# if not option, treat all follow files as args
Expand All @@ -97,10 +129,7 @@ while [ $# -gt 0 ]; do
esac
done

[ "${#files[@]}" -eq 0 ] && {
redEcho "Error: NO argument!" 1>&2
exit 1
}
[ "${#files[@]}" -eq 0 ] && die "NO argument!"

if [ "${#files[@]}" -eq 1 ]; then
relativeTo=.
Expand All @@ -113,12 +142,25 @@ else
fi

[ -f "$relativeTo" ] && relativeTo="$(dirname "$relativeTo")"
[ -e "$relativeTo" ] || die "relativeTo dir($relativeTo) does NOT exists!"

readonly files relativeTo

################################################################################
# biz logic
################################################################################

has_error=false

for f in "${files[@]}"; do
! [ -e "$f" ] && {
echo "$f does not exists!"
continue
}
realpath "$f" --relative-to="$relativeTo"
if [ -e "$f" ]; then
portableRelPath "$f" "$relativeTo"
else
redPrint "error: $f does not exists!" >&2
has_error=true
fi
done

if $has_error; then
exit 1
fi

0 comments on commit f724c6a

Please sign in to comment.