tweaked logging in case of packaging errors (relates to #106)

Holger Brandl · Holger Brandl · commit 63644783cddc · 2018-03-05T10:04:06.000+01:00
diff --git a/src/main/kotlin/kscript/app/AppHelpers.kt b/src/main/kotlin/kscript/app/AppHelpers.kt
@@ -362,13 +362,9 @@ exec java -jar ${'$'}0 "${'$'}@"
 
     val pckgResult = evalBash("cd ${tmpProjectDir} && gradle simpleCapsule && cp build/libs/${appName}*.jar ${pckgedJar} && chmod +x ${pckgedJar}")
 
-    infoMsg("Finished packaging into ${pckgedJar}")
-
-    //    evalBash("idea ${tmpProjectDir.absolutePath}")
-
     with(pckgResult) {
-        kscript.app.errorIf(exitCode != 0) { "packaging of '$appName' failed:\n$stderr" }
+        kscript.app.errorIf(exitCode != 0) { "packaging of '$appName' failed:\n$pckgResult" }
     }
 
-    //    return "idea ${tmpProjectDir.absolutePath}"
+    infoMsg("Finished packaging into ${pckgedJar}")
 }

Original file line number	Diff line number	Diff line change
`@@ -362,13 +362,9 @@ exec java -jar ${'$'}0 "${'$'}@"`
`362`	`362`
`363`	`363`	`val pckgResult = evalBash("cd ${tmpProjectDir} && gradle simpleCapsule && cp build/libs/${appName}*.jar ${pckgedJar} && chmod +x ${pckgedJar}")`
`364`	`364`
`365`		`- infoMsg("Finished packaging into ${pckgedJar}")`
`366`		`-`
`367`		`- // evalBash("idea ${tmpProjectDir.absolutePath}")`
`368`		`-`
`369`	`365`	`with(pckgResult) {`
`370`		`- kscript.app.errorIf(exitCode != 0) { "packaging of '$appName' failed:\n$stderr" }`
	`366`	`+ kscript.app.errorIf(exitCode != 0) { "packaging of '$appName' failed:\n$pckgResult" }`
`371`	`367`	`}`
`372`	`368`
`373`		`- // return "idea ${tmpProjectDir.absolutePath}"`
	`369`	`+ infoMsg("Finished packaging into ${pckgedJar}")`
`374`	`370`	`}`