Merge pull request #8 from rohitagarwal01/kenzan-develop

update unixScript.text template file
spinnaker · Nov 10, 2015 · 4c7b44f · 4c7b44f
2 parents 2338c39 + 0cdbe45
commit 4c7b44f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 171 deletions.
diff --git a/clouddriver-web/clouddriver-web.gradle b/clouddriver-web/clouddriver-web.gradle
@@ -52,14 +52,16 @@ jar {
   }
 }
 
+
 startScripts {
-  doLast { 
-    unixScript.text = new File('clouddriver-web/config/unixStartScript.txt').text
+  doLast {
+    unixScript.text = unixScript.text.replace('DEFAULT_JVM_OPTS=', '\n if [ -f /etc/default/spinnaker ];then \n . /etc/default/spinnaker \n fi \n DEFAULT_JVM_OPTS=')
     unixScript.text = unixScript.text.replace('CLASSPATH=$APP_HOME', 'CLASSPATH=$APP_HOME/config:$APP_HOME')
     windowsScript.text = windowsScript.text.replace('set CLASSPATH=', 'set CLASSPATH=%APP_HOME%\\config;')
   }
 }
 
+
 ospackage {
   packageName = project.applicationName
   version = project.version.replaceAll('-SNAPSHOT', '')

diff --git a/clouddriver-web/config/unixStartScript.txt b/clouddriver-web/config/unixStartScript.txt