summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-17 22:42:13 +0000
committerKarl Berry <karl@freefriends.org>2011-04-17 22:42:13 +0000
commitad1e4d8e6581af6cb4c9a35f02f09ffda2d97df7 (patch)
tree62d972bb50afece3227f1ab7a79a67cd254389ce /Master/texmf-dist/scripts
parent45824df4db55ca98caef21d38b00d54ccdb5be4c (diff)
oberdiek (17apr11)
git-svn-id: svn://tug.org/texlive/trunk@22111 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rw-r--r--Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua18
-rw-r--r--Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua18
2 files changed, 24 insertions, 12 deletions
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
index c54a297c3c1..c55edbb5de0 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.pdftexcmds.lua
@@ -38,7 +38,7 @@
module("oberdiek.pdftexcmds", package.seeall)
local systemexitstatus
function getversion()
- tex.write("2011/04/10 v0.14")
+ tex.write("2011/04/16 v0.15")
end
function strcmp(A, B)
if A == B then
@@ -271,14 +271,20 @@ function filemdfivesum(filename)
end
function shellescape()
if os.execute then
- local result = os.execute()
- if result == 0 then
- tex.write("0")
+ if status
+ and status.luatex_version
+ and status.luatex_version >= 70 then
+ tex.write(os.execute())
else
- if result == nil then
+ local result = os.execute()
+ if result == 0 then
tex.write("0")
else
- tex.write("1")
+ if result == nil then
+ tex.write("0")
+ else
+ tex.write("1")
+ end
end
end
else
diff --git a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
index 69b8964e712..c11c0f02ec9 100644
--- a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
+++ b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
@@ -38,7 +38,7 @@
module("oberdiek.pdftexcmds", package.seeall)
local systemexitstatus
function getversion()
- tex.write("2011/04/10 v0.14")
+ tex.write("2011/04/16 v0.15")
end
function strcmp(A, B)
if A == B then
@@ -271,14 +271,20 @@ function filemdfivesum(filename)
end
function shellescape()
if os.execute then
- local result = os.execute()
- if result == 0 then
- tex.write("0")
+ if status
+ and status.luatex_version
+ and status.luatex_version >= 70 then
+ tex.write(os.execute())
else
- if result == nil then
+ local result = os.execute()
+ if result == 0 then
tex.write("0")
else
- tex.write("1")
+ if result == nil then
+ tex.write("0")
+ else
+ tex.write("1")
+ end
end
end
else