1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

ksh: fix up shipin for more modern systems WRT test and wc

Patch submitted by Giacomo Comes.
This commit is contained in:
Jon Trulson 2015-11-22 15:37:40 -07:00
parent f8fdf4920f
commit 05445493d9

View file

@ -64,6 +64,9 @@ case $- in
;; ;;
esac esac
# disable the builtin wc because ksh may hang during the execution later of "wc pic.o"
builtin -d wc
# #
# this script may be overwritten while it is being executed # this script may be overwritten while it is being executed
# so copy it and exec from the copy # so copy it and exec from the copy
@ -569,7 +572,8 @@ do case $1 in
eval _ship${_cmd_}_= eval _ship${_cmd_}_=
continue continue
fi fi
if test "$new" -gt "$old" # the variable "old" can be empty, to avoid "arithmetic syntax error" from ksh, set it to 0
if test "$new" -gt "${old:-0}"
then case $_suf_ in then case $_suf_ in
?*) cp ship$_cmd_$_suf_ SHIP$_cmd_$_suf_ ;; ?*) cp ship$_cmd_$_suf_ SHIP$_cmd_$_suf_ ;;
esac esac
@ -583,7 +587,8 @@ do case $1 in
case $_suf_ in case $_suf_ in
.c) test -f $f && ./$f </dev/null >/dev/null 2>&1 || old=0 ;; .c) test -f $f && ./$f </dev/null >/dev/null 2>&1 || old=0 ;;
esac esac
if test "$new" -gt "$old" # the variable "old" can be empty, to avoid "arithmetic syntax error" from ksh, set it to 0
if test "$new" -gt "${old:-0}"
then case $old in then case $old in
""|0) ;; ""|0) ;;
*) cp ship$_cmd_ SHIP$_cmd_ ;; *) cp ship$_cmd_ SHIP$_cmd_ ;;
@ -612,7 +617,8 @@ do case $1 in
esac esac
case $_flg_ in case $_flg_ in
*B*) f=$BIN/$_cmd_; eval old=$_stamp_ *B*) f=$BIN/$_cmd_; eval old=$_stamp_
if test "$new" -gt "$old" # the variable "old" can be empty, to avoid "arithmetic syntax error" from ksh, set it to 0
if test "$new" -gt "${old:-0}"
then if test ! -d $BIN then if test ! -d $BIN
then mkdir $BIN then mkdir $BIN
fi fi