summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-07-08 01:30:51 -0700
committerMichael Forney <mforney@mforney.org>2019-07-08 01:30:51 -0700
commit3655a6405959aa41f970e1498d94694578819525 (patch)
treecef5d35182cfb55a5703f37cb2e0a9561a1ad8f7 /pkg
parent1065ea0eb5363e5806e3ab977036e7719a206893 (diff)
Revert "tz: Honor config.fs when writing tzdata.index"
This reverts commit 8b0c936479fe3435747fd06dccffea6d26583998.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/tz/tzdata.lua7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/tz/tzdata.lua b/pkg/tz/tzdata.lua
index b87ff119..903af2cf 100644
--- a/pkg/tz/tzdata.lua
+++ b/pkg/tz/tzdata.lua
@@ -1,6 +1,3 @@
-dofile 'ninja.lua'
-config = dofile 'config.lua'
-
local function execute(cmd)
if not os.execute(cmd) then
error('command failed: '..cmd)
@@ -14,12 +11,12 @@ for i = 3, #arg do
execute(string.format('zic -d %s %s', outdir, arg[i]))
for line in io.lines(arg[i]) do
local target, name = line:match('^Link%s+(%g+)%s+(%g+)')
- if target and fs('tz', 'share/zoneinfo/'..name) then
+ if target then
target = name:gsub('[^/]+', '..'):sub(1, -3)..target
execute(hash:format(repo, 120000, name, target))
else
name = line:match('^Zone%s+(%g+)')
- if name and fs('tz', 'share/zoneinfo/'..name) then
+ if name then
execute(hash:format(repo, 100644, name, outdir..'/'..name))
end
end