Merge branch 'develop' of https://github.com/codeoverflow-org/chatoverflow into develop

sebinside · sebinside · commit dd0518371180 · 2019-07-29T17:15:19.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ project/plugins/project/
 /plugins-public/
 /plugins-private/
 /gui/
+/setup/
 
 # Plugin Framework
 /plugins/
diff --git a/project/SbtFile.scala b/project/SbtFile.scala
@@ -55,11 +55,11 @@ class SbtFile(var name: String, var version: String, var plugins: List[Plugin],
     val sbtContent = new StringBuilder("// GENERATED FILE USING THE CHAT OVERFLOW PLUGIN FRAMEWORK\n")
 
     if (name != "") {
-      sbtContent append "\nname := \"%s\"".format(name.replaceAll("\\", ""))
+      sbtContent append "\nname := \"%s\"".format(name.replaceAll("\\\\", ""))
     }
 
     if (version != "") {
-      sbtContent append "\nversion := \"%s\"".format(version.replaceAll("\\", ""))
+      sbtContent append "\nversion := \"%s\"".format(version.replaceAll("\\\\", ""))
     }
 
     if (plugins.nonEmpty) {

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ class SbtFile(var name: String, var version: String, var plugins: List[Plugin],`
`55`	`55`	`val sbtContent = new StringBuilder("// GENERATED FILE USING THE CHAT OVERFLOW PLUGIN FRAMEWORK\n")`
`56`	`56`
`57`	`57`	`if (name != "") {`
`58`		`- sbtContent append "\nname := \"%s\"".format(name.replaceAll("\\", ""))`
	`58`	`+ sbtContent append "\nname := \"%s\"".format(name.replaceAll("\\\\", ""))`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (version != "") {`
`62`		`- sbtContent append "\nversion := \"%s\"".format(version.replaceAll("\\", ""))`
	`62`	`+ sbtContent append "\nversion := \"%s\"".format(version.replaceAll("\\\\", ""))`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (plugins.nonEmpty) {`