summaryrefslogtreecommitdiffstats
path: root/lib/format.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-09-26 18:16:31 +0000
committerTed Trask <ttrask01@yahoo.com>2008-09-26 18:16:31 +0000
commiteb012794028e9f5670feb03718c03ad699e8d935 (patch)
tree4a73c5a4cb7ef7b444236cca06ef04b651bb8996 /lib/format.lua
parente78de1270cce57dbe3abeab1857084a4de613cdb (diff)
downloadacf-core-eb012794028e9f5670feb03718c03ad699e8d935.tar.bz2
acf-core-eb012794028e9f5670feb03718c03ad699e8d935.tar.xz
Cleanup of some libs.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1533 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'lib/format.lua')
-rw-r--r--lib/format.lua29
1 files changed, 14 insertions, 15 deletions
diff --git a/lib/format.lua b/lib/format.lua
index e19899f..6de19c4 100644
--- a/lib/format.lua
+++ b/lib/format.lua
@@ -179,7 +179,7 @@ function md5sum_string ( str)
local checksum = {}
for line in f:lines() do
checksum[#checksum + 1] = line
- end
+ end
f:close()
return checksum[1]
end
@@ -189,21 +189,20 @@ end
-- ex: a="foo"; print(expand_bash_syntax_vars("a=${a}) - > "a=foo"
expand_bash_syntax_vars = function ( str )
+ local deref = function ( f)
+ local v = _G
+ for w in string.gfind(f, "[%w_]+") do
+ v = v[w]
+ end
+ return v
+ end
- local deref = function ( f)
- local v = _G
- for w in string.gfind(f, "[%w_]+") do
- v = v[w]
- end
- return v
- end
-
- for w in string.gmatch (str, "${[^}]*}" ) do
- local rvar = string.sub(w,3,-2)
- local rval = ( deref(rvar) or "nil" )
- str = string.gsub (str, w, rval)
- end
- return (str)
+ for w in string.gmatch (str, "${[^}]*}" ) do
+ local rvar = string.sub(w,3,-2)
+ local rval = ( deref(rvar) or "nil" )
+ str = string.gsub (str, w, rval)
+ end
+ return (str)
end
-- Removes the linenum line from str and replaces it with line.