Fixes to 2014/wiedijk/try.sh
Better handling of trying to find indent(1) and sed(1) in the case of invalid source. Use "$CC" instead of raw 'cc'. Fix for shellcheck.
This commit is contained in:
1 parent
910e3a6a5c
commit
a9f637c3be
1 file changed
+5
-4
+5
-4
@@ -18,11 +18,11 @@ clear
|
|||||||
|
|
||||||
# Make sure that indent(1) and sed(1) are installed but let user override them
|
# Make sure that indent(1) and sed(1) are installed but let user override them
|
||||||
# as well say for using a different beautifier. We assume less(1) is installed.
|
# as well say for using a different beautifier. We assume less(1) is installed.
|
||||||
|
|
||||||
if [[ -z "$INDENT" ]]; then
|
if [[ -z "$INDENT" ]]; then
|
||||||
INDENT="$(type -P indent)"
|
INDENT="$(type -P indent)"
|
||||||
else
|
else
|
||||||
INDENT="$(type -P "$INDENT")"
|
INDENT="$(type -P "$INDENT")"
|
||||||
|
[[ ! -f "$INDENT" || ! -x "$INDENT" ]] && INDENT="$(type -P indent)"
|
||||||
fi
|
fi
|
||||||
if [[ ! -x "$INDENT" ]]; then
|
if [[ ! -x "$INDENT" ]]; then
|
||||||
echo "$0: cannot find indent, sorry." 1>&2
|
echo "$0: cannot find indent, sorry." 1>&2
|
||||||
@@ -33,14 +33,15 @@ if [[ -z "$SED" ]]; then
|
|||||||
SED="$(type -P sed)"
|
SED="$(type -P sed)"
|
||||||
else
|
else
|
||||||
SED="$(type -P "$SED")"
|
SED="$(type -P "$SED")"
|
||||||
|
[[ ! -f "$SED" || ! -x "$SED" ]] && SED="$(type -P sed)"
|
||||||
fi
|
fi
|
||||||
if [[ ! -x "$SED" ]]; then
|
if [[ ! -x "$SED" ]]; then
|
||||||
echo "$0: cannot find sed, sorry." 1>&2
|
echo "$0: cannot find sed, sorry." 1>&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$ cc -E prog.c | "$INDENT" |
|
echo "$ $CC -E prog.c | $INDENT |
|
||||||
"$SED" '1,/5.*prog/d' | less -EXF"
|
$SED '1,/5.*prog/d'"
|
||||||
read -r -n 1 -p "Press any key to continue (space = next page, q = quit): "
|
read -r -n 1 -p "Press any key to continue (space = next page, q = quit): "
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
cc -E prog.c | "$INDENT" | "$SED" '1,/5.*prog/d' | less -EXF
|
"$CC" -E prog.c | "$INDENT" | "$SED" '1,/5.*prog/d' | less -EXF
|
||||||
Reference in new issue
Block a user