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 7a9750f3e4962104204b2ec647e5323e35cda25c..521e0a27d3eaf6e03e610248adb866595673104d 100644 (file)
--- 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 a93b4b0ea3c00c6ece6f2199cd14baa05b79cd7e..fecc294b689fa50dba43e8a2825197a30c618f3a 100644 (file)
--- 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 1c5569ccd4f5b3024bf0552e9af619376b6e34f8..26410c98a13d8f7a4c0c7847a6a2c7e677883c5f 100644 (file)
--- 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