summaryrefslogtreecommitdiffstats
path: root/lbu-model.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-10-13 15:18:02 +0000
committerTed Trask <ttrask01@yahoo.com>2008-10-13 15:18:02 +0000
commit2be4cd2a378590d317e0a6ff900d58a6357e65f8 (patch)
treeda3a18f0948b086fd1248b9f6a1733024e9543d2 /lbu-model.lua
parent0e5f014c26a2564c3c6398ba3e9e978b16650091 (diff)
downloadacf-alpine-conf-2be4cd2a378590d317e0a6ff900d58a6357e65f8.tar.bz2
acf-alpine-conf-2be4cd2a378590d317e0a6ff900d58a6357e65f8.tar.xz
Fixed lbu problem with failure to update commented-out lines with spaces.
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-conf/trunk@1555 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'lbu-model.lua')
-rw-r--r--lbu-model.lua11
1 files changed, 5 insertions, 6 deletions
diff --git a/lbu-model.lua b/lbu-model.lua
index c190c34..ae91096 100644
--- a/lbu-model.lua
+++ b/lbu-model.lua
@@ -281,16 +281,15 @@ function setconfig (config)
local content = (fs.read_file(configfile) or "").."\n"
-- LBU_MEDIA, ENCRYPTION, DEFAULT_CIPHER, PASSWORD
- content = replacestring(content, "#*LBU_MEDIA=[^\n]*\n", "LBU_MEDIA="..config.value.LBU_MEDIA.value.."\n")
+ content = replacestring(content, "[^\n%w]*LBU_MEDIA=[^\n]*\n", "LBU_MEDIA="..config.value.LBU_MEDIA.value.."\n")
local newstring = "ENCRYPTION=$DEFAULT_CIPHER\n"
if not config.value.ENCRYPTION.value then
newstring = "#" .. newstring
end
- content = replacestring(content, "#*ENCRYPTION=[^\n]*\n", newstring)
- content = replacestring(content, "#*DEFAULT_CIPHER=[^\n]*\n", "DEFAULT_CIPHER="..config.value.DEFAULT_CIPHER.value.."\n")
- content = replacestring(content, "#*PASSWORD=[^\n]*\n", "PASSWORD="..config.value.PASSWORD.value.."\n")
- content = replacestring(content, "#*BACKUP_LIMIT=[^\n]*\n", "BACKUP_LIMIT="..config.value.BACKUP_LIMIT.value.."\n")
- content = string.gsub(content,"\n*$","")
+ content = replacestring(content, "[^\n%w]*ENCRYPTION=[^\n]*\n", newstring)
+ content = replacestring(content, "[^\n%w]*DEFAULT_CIPHER=[^\n]*\n", "DEFAULT_CIPHER="..config.value.DEFAULT_CIPHER.value.."\n")
+ content = replacestring(content, "[^\n%w]*PASSWORD=[^\n]*\n", "PASSWORD="..config.value.PASSWORD.value.."\n")
+ content = replacestring(content, "[^\n%w]*BACKUP_LIMIT=[^\n]*\n", "BACKUP_LIMIT="..config.value.BACKUP_LIMIT.value.."\n")
-- Write changes to file
fs.write_file(configfile,content)