From a2bf02382ea45c2a9cb2d6363339c37f080ea541 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 19 Apr 2015 11:02:52 +0300 Subject: [PATCH] zoneinfo2lua.pl: fix path, update to match trunk Fix the path to timezone data in Luci to match the current structure. Change zoneinfo2lua.pl to generate short copyright messages like trunk. Change the advice on line 3 about directory, where this script should be run. Signed-off-by: Hannu Nyman --- build/zoneinfo2lua.pl | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/build/zoneinfo2lua.pl b/build/zoneinfo2lua.pl index 722711a97c..ed2960eaa9 100755 --- a/build/zoneinfo2lua.pl +++ b/build/zoneinfo2lua.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # zoneinfo2lua.pl - Make Lua module from /usr/share/zoneinfo -# Execute from within /usr/share/zoneinfo +# Execute from within root of Luci feed, usually feeds/luci # $Id$ use strict; @@ -8,7 +8,7 @@ use strict; my %TZ; my $tzdin = $ARGV[0] || "/usr/share/zoneinfo"; -my $tzdout = $ARGV[1] || "./libs/sys/luasrc/sys/zoneinfo"; +my $tzdout = $ARGV[1] || "./modules/base/luasrc/sys/zoneinfo"; local $/ = "\012"; open( ZTAB, "< $tzdin/zone.tab" ) || die "open($tzdin/zone.tab): $!"; @@ -51,16 +51,7 @@ open(O, "> $tzdout/tzdata.lua") || die "open($tzdout/tzdata.lua): $!\n"; print STDERR "Writing time zones to $tzdout/tzdata.lua ... "; print O < $tzdout/tzoffset.lua") || die "open($tzdout/tzoffset.lua): $!\n"; print STDERR "Writing time offsets to $tzdout/tzoffset.lua ... "; print O <