From 5fd19eab36570459d6c98f67e650e5060885c383 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 15 Jan 2014 17:01:38 +0100 Subject: [PATCH] Use time only if it exists. --- misc/tools/all/config.subr | 6 ++++++ misc/tools/all/git.subr | 4 ++-- misc/tools/all/xonotic.subr | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr index ab4445e7..2ebddfb3 100644 --- a/misc/tools/all/config.subr +++ b/misc/tools/all/config.subr @@ -34,3 +34,9 @@ allmirrors() "$@" ssh push ssh://xonotic@push.git.xonotic.org/ '' } + +if ! { time -p sh -c 'true'; } >/dev/null 2>&1; then + time= +else + time="time -p" +fi diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr index a7f7d354..c29685dc 100644 --- a/misc/tools/all/git.subr +++ b/misc/tools/all/git.subr @@ -56,7 +56,7 @@ mirrorspeed() # first result is to be ignored, but we use it to check status git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1 # if we can't time, we only check availability - if ! { time -p sh -c 'true'; } >/dev/null 2>&1; then + if [ -z "$time" ]; then echo 0 return fi @@ -64,7 +64,7 @@ mirrorspeed() ( set +x export REPO=$1 # so that the sh -c subshell can use it - { time -p sh -c 'git ls-remote "$REPO" refs/heads/master >/dev/null 2>&1'; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' | grep . || echo 0 + { $time sh -c 'git ls-remote "$REPO" refs/heads/master >/dev/null 2>&1'; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' | grep . || echo 0 # unit: clock ticks (depends on what "time" returns ) } diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 8cfbd9c4..7be8fa06 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -17,7 +17,7 @@ case "$cmd" in if [ ! -f "$mapfile" ] ; then msg "ERROR, $mapfile not found!" else - time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" + $time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" fi done ;; @@ -336,7 +336,7 @@ case "$cmd" in set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@" fi rm -f xonotic.core - time "$@" || true + $time "$@" || true if [ -f xonotic.core ]; then if yesno "The program has CRASHED. Do you want to examine the core dump?"; then gdb "$binary" xonotic.core -- 2.39.2