Merge branch 'develop'

flintprocessor · Jun 8, 2018 · bcf97a9 · bcf97a9
2 parents 8ea8865 + 00af0c8
commit bcf97a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Scripts/SyncVersion.swift b/Scripts/SyncVersion.swift
@@ -13,7 +13,7 @@ versionSwift.enumerateLines { line, _ in
     lines.append(line)
 }
 lines.removeLast()
-lines.append("let version = \"\(version)\"")
+lines.append("let version = \"\(version)\"\n")
 let newFileContent = lines.joined(separator: "\n")
 
 try! newFileContent.write(toFile: pathToVersionSwift, atomically: true, encoding: .utf8)
diff --git a/Sources/Flint/spark/sparkCommandHandler.swift b/Sources/Flint/spark/sparkCommandHandler.swift
@@ -162,7 +162,7 @@ let sparkCommandHandler: CommandHandler = { _, _, operandValues, optionValues in
     for prehook in template.manifest.prehooks ?? [] {
         let scriptPath = template.prehookScriptsPath[prehook]
         if scriptPath.exists {
-            let work = Work(command: "sh \(scriptPath.path)",
+            let work = Work(command: "sh \"\(scriptPath.path)\"",
                 standardOutputHandler: { standardOutput in
                     print(standardOutput)
                 }, standardErrorHandler: { standardError in
@@ -239,7 +239,7 @@ let sparkCommandHandler: CommandHandler = { _, _, operandValues, optionValues in
     for posthook in template.manifest.posthooks ?? [] {
         let scriptPath = template.posthookScriptsPath[posthook]
         if scriptPath.exists {
-            let work = Work(command: "sh \(scriptPath.path)",
+            let work = Work(command: "sh \"\(scriptPath.path)\"",
                 standardOutputHandler: { standardOutput in
                     print(standardOutput)
                 }, standardErrorHandler: { standardError in

diff --git a/Sources/Flint/version/version.swift b/Sources/Flint/version/version.swift
@@ -25,4 +25,4 @@
 
 import Foundation
 
-let version = "0.1.1"
+let version = "0.1.2"
diff --git a/Version b/Version
@@ -1 +1 @@
-0.1.1
+0.1.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,4 @@

		import Foundation

		let version = "0.1.1"
		let version = "0.1.2"