[Buildroot] [git commit] fakedate: simplify logic
Peter Korsgaard
peter at korsgaard.com
Mon Jul 3 13:10:58 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=e7548edb5f930362e361b14eb67cda2b16c8846c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Using -ef to check for the same file is nicer than relying on a magic
symlink-to-fakedate.
Notice that -ef isn't stricly posix (but supported by bash/dash/zsh), so
I've changed the shebang to /bin/bash.
While we are at it, restructure the logic to do a single exec at the end
instead of handling the epoch/!epoch cases differently for simplicity.
With that out of the way we can directly install it as $HOST/usr/bin/date
instead of the fakedate / date symlink.
[Peter: drop IFS=: change]
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/fakedate/fakedate | 14 ++++----------
package/fakedate/fakedate.mk | 3 +--
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate
index 4a9b9b5..a64d9b9 100755
--- a/package/fakedate/fakedate
+++ b/package/fakedate/fakedate
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set sw=4 expandtab:
#
# This program is free software; you can redistribute it and/or modify
@@ -18,18 +18,12 @@
# Copyright (C) 2016 Jérôme Pouiller <jezz at sysmic.org>
#
-# Sanity check
-if ! readlink -f "$0" | grep -q fakedate; then
- echo "fakedate: Please name this script \`fakedate'"
- exit 1
-fi
-
DATE_BIN=false
# Do not call `date' directly since it will produce an infinite recursion.
# Instead, find path of true `date' binary.
for P in `echo $PATH | tr ':' ' '`; do
if [ -x "$P/date" ]; then
- if readlink -f "$P/date" | grep -qv fakedate; then
+ if ! [ "$P/date" -ef "$0" ]; then
DATE_BIN="$P/date"
break;
fi
@@ -50,8 +44,8 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then
done
if [ $FORCE_EPOCH -eq 1 ]; then
echo "date: Warning: using \$SOURCE_DATE_EPOCH instead of true time" >&2
- exec $DATE_BIN -d "@$SOURCE_DATE_EPOCH" "$@"
+ ARGS="-d @$SOURCE_DATE_EPOCH"
fi
fi
-exec $DATE_BIN "$@"
+exec $DATE_BIN $ARGS "$@"
diff --git a/package/fakedate/fakedate.mk b/package/fakedate/fakedate.mk
index f47a5ee..5d90f71 100644
--- a/package/fakedate/fakedate.mk
+++ b/package/fakedate/fakedate.mk
@@ -8,8 +8,7 @@
HOST_FAKEDATE_LICENSE = GPL-2.0+
define HOST_FAKEDATE_INSTALL_CMDS
- $(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/usr/bin/fakedate
- ln -sfn fakedate $(HOST_DIR)/usr/bin/date
+ $(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/usr/bin/date
endef
$(eval $(host-generic-package))
More information about the buildroot
mailing list