Merge pull request #34 from funbox/develop

Version 0.15.2

.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: go
 
 go:
-  - 1.6.x
   - 1.7.x
   - 1.8.x
+  - 1.9.x
   - tip
 
 branches:

cli/cli.go

@@ -31,7 +31,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter"
-	VER  = "0.15.1"
+	VER  = "0.15.2"
 	DESC = "Utility for exporting services described by Procfile to init system"
 )
 

common/init-exporter.spec

@@ -42,7 +42,7 @@
 
 Summary:         Utility for exporting services described by Procfile to init system
 Name:            init-exporter
-Version:         0.15.1
+Version:         0.15.2
 Release:         0%{?dist}
 Group:           Development/Tools
 License:         MIT
@@ -111,6 +111,9 @@ rm -rf %{buildroot}
 ###############################################################################
 
 %changelog
+* Tue Aug 29 2017 Anton Novojilov <[email protected]> - 0.15.2-0
+- Fixed output redirect in systemd units
+
 * Thu Jun 01 2017 Anton Novojilov <[email protected]> - 0.15.1-0
 - Added support of asterisk symbol in environment variables
 - Improved paths validation

export/export_test.go

@@ -371,7 +371,7 @@ func (s *ExportSuite) TestSystemdExport(c *C) {
 			"User=service",
 			"Group=service",
 			"WorkingDirectory=/srv/service/serviceA-dir",
-			fmt.Sprintf("ExecStart=/bin/bash %s/test_application-serviceA1.sh &>>/var/log/test_application/serviceA.log", helperDir),
+			fmt.Sprintf("ExecStart=/bin/sh -c '/bin/bash %s/test_application-serviceA1.sh &>>/var/log/test_application/serviceA.log'", helperDir),
 			"",
 			""},
 	)
@@ -403,7 +403,7 @@ func (s *ExportSuite) TestSystemdExport(c *C) {
 			"User=service",
 			"Group=service",
 			"WorkingDirectory=/srv/service/serviceA-dir",
-			fmt.Sprintf("ExecStart=/bin/bash %s/test_application-serviceA2.sh &>>/var/log/test_application/serviceA.log", helperDir),
+			fmt.Sprintf("ExecStart=/bin/sh -c '/bin/bash %s/test_application-serviceA2.sh &>>/var/log/test_application/serviceA.log'", helperDir),
 			"",
 			""},
 	)
@@ -435,7 +435,7 @@ func (s *ExportSuite) TestSystemdExport(c *C) {
 			"User=service",
 			"Group=service",
 			"WorkingDirectory=/srv/service/working-dir",
-			fmt.Sprintf("ExecStart=/bin/bash %s/test_application-serviceB.sh &>>/var/log/test_application/serviceB.log", helperDir),
+			fmt.Sprintf("ExecStart=/bin/sh -c '/bin/bash %s/test_application-serviceB.sh &>>/var/log/test_application/serviceB.log'", helperDir),
 			"ExecReload=/bin/kill -SIGUSR2 $MAINPID",
 			""},
 	)

export/systemd.go

@@ -85,7 +85,7 @@ ExecStartPre=/bin/chmod g+w /var/log/{{.Application.Name}}/{{.Service.Name}}.log
 User={{.Application.User}}
 Group={{.Application.Group}}
 WorkingDirectory={{.Service.Options.WorkingDir}}
-ExecStart=/bin/bash {{.Service.HelperPath}} &>>/var/log/{{.Application.Name}}/{{.Service.Name}}.log
+ExecStart=/bin/sh -c '/bin/bash {{.Service.HelperPath}} &>>/var/log/{{.Application.Name}}/{{.Service.Name}}.log'
 {{ if .Service.Options.IsReloadSignalSet }}ExecReload=/bin/kill -{{.Service.Options.ReloadSignal}} $MAINPID{{ end }}
 `