From 2be4cd2a378590d317e0a6ff900d58a6357e65f8 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 13 Oct 2008 15:18:02 +0000 Subject: 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 --- lbu-model.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lbu-model.lua') 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) -- cgit v1.2.3