From: Steven Barth <steven@midlink.org>
Date: Tue, 20 Jan 2009 11:33:33 +0000 (+0000)
Subject: Replace Dos line endings with Unix ones where needed
X-Git-Tag: 0.8.5~50
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=119a545ffcd35df1d06c9bd91db7cfe7fa8a2283

Replace Dos line endings with Unix ones where needed
---

diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua b/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
index 7a9750f3e..521e0a27d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
@@ -26,10 +26,10 @@ end
 function f.handle(self, state, data)
 	if state == FORM_VALID then
 		if data.crons then
-			luci.fs.writefile(cronfile, data.crons)
+			luci.fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
 		end
 	end
 	return true
 end
 
-return f
\ No newline at end of file
+return f
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
index a93b4b0ea..fecc294b6 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
@@ -23,7 +23,7 @@ function t.cfgvalue()
 end
 
 function t.write(self, section, data)
-	return luci.fs.writefile(ipkgfile, data)
+	return luci.fs.writefile(ipkgfile, data:gsub("\r\n", "\n"))
 end
 
 f:append(Template("admin_system/ipkg"))
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
index 1c5569ccd..26410c98a 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
@@ -26,10 +26,10 @@ end
 function f.handle(self, state, data)
 	if state == FORM_VALID then
 		if data.keys then
-			luci.fs.writefile(keyfile, data.keys)
+			luci.fs.writefile(keyfile, data.keys:gsub("\r\n", "\n"))
 		end
 	end
 	return true
 end
 
-return f
\ No newline at end of file
+return f