[Buildroot] [PATCH] fakedate: simplify logic
Arnout Vandecappelle
arnout at mind.be
Mon Mar 27 21:46:43 UTC 2017
On 08-02-17 15:50, Jérôme Pouiller wrote:
> Hello Peter,
>
> On Tuesday 07 February 2017 23:08:17 Peter Korsgaard wrote:
> [...]
>> diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate
>> index 4a9b9b5e6..abe6b38f9 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
>> +IFS=':'; for P in $PATH; do
>
> I think you have to reset $IFS to its previous value after used
> it.
That's on principle, though in this script there is no more word splitting
after the loop.
>
> Globally, I dislike use of $IFS. I think it may produce unattended side
> effects.
Yeah, I find it particularly confusing when you need a different word splitting
inside the loop...
So indeed, I'd drop the IFS part from this patch. I don't think it makes things
simpler.
>
>
>> if [ -x "$P/date" ]; then
>> - if readlink -f "$P/date" | grep -qv fakedate; then
>> + if ! [ "$P/date" -ef "$0" ]; then
>
> Nice! I didn't know '-ef'.
If you want to avoid the dependency on bash, you can also use
if [ "$(readlink -f "$P/date")" != "$(readlink -f "$0")" ]; then
but it's not exactly more readable :-)
>
>> 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"
>
> Indentation seems incorrect: s/\t/ /
Very true.
>
>> fi
>> fi
>>
>> -exec $DATE_BIN "$@"
>> +exec $DATE_BIN $ARGS "$@"
>
> It's matter of taste.
I'm fine either way.
>
>
>> diff --git a/package/fakedate/fakedate.mk
> b/package/fakedate/fakedate.mk
>> index 61d4bd702..e81ce5dac 100644
>> --- a/package/fakedate/fakedate.mk
>> +++ b/package/fakedate/fakedate.mk
>> @@ -8,8 +8,7 @@
>> HOST_FAKEDATE_LICENSE = GPLv2+
>>
>> 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
>
> Hmm... In order to not confuse user, I prefer to keep fakedate as
> original name and adding a symlink beside.
I don't, I think it's clearer as a script than as a symlink.
I don't mind much about the IFS part (it really should have been a separate
patch, though), and the tab-space mixup can be fixed up while committing, so
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Regards,
Arnout
>
>> endef
>>
>> $(eval $(host-generic-package))
>>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list