Fixed version problem in init-script-template

zk · Jun 27, 2010 · dbc2f9b · dbc2f9b
1 parent bc0e54c
commit dbc2f9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/resources/init-script-template b/resources/init-script-template
@@ -3,10 +3,11 @@
 # chkconfig: 345 95 20
 
 NAME=%s
+VERSION=%s
 PID_DIR=%s
 PID_FILE=$PID_DIR/$NAME.pid
 INSTALL_DIR=%s
-INSTALL_JAR=$INSTALL_DIR/"$NAME"-standalone.jar
+INSTALL_JAR=$INSTALL_DIR/"$NAME"-"$VERSION"-standalone.jar
 mkdir -p $PID_DIR
 
 start() {

diff --git a/src/leiningen/init_script.clj b/src/leiningen/init_script.clj
@@ -39,12 +39,13 @@
 
 (defn gen-init-script [project opts]
   (let [name (:name project)
+	version (:version project)
 	description (:description project)
 	pid-dir (:pid-dir opts)
 	jar-install-dir (:jar-install-dir opts)
 	java-flags (format-java-string opts)
 	redirect-output-to (:redirect-output-to opts)]
-    (format init-script-template name pid-dir jar-install-dir java-flags redirect-output-to)))
+    (format init-script-template name version pid-dir jar-install-dir java-flags redirect-output-to)))
 
 (defn gen-install-script [uberjar-path init-script-path opts]
   (let [jar-install-dir (:jar-install-dir opts)
@@ -81,7 +82,6 @@
      :version version}))
 
 (defn init-script [projects & args]
-  (println projects)
   (let [opts (merge (defaults projects) (:lis-opts projects))
 	root (:root projects)
 	name (:name opts)