Browse Source

Upgrade java/lein to use .installed convention

Zane Kansil 10 years ago
parent
commit
e754cb912e

+ 1 - 5
frameworks/Clojure/pedestal/install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-
-export LEIN_HOME=$IROOT/lein
-
-fw_depends leiningen java
+fw_depends leiningen java7

+ 5 - 5
frameworks/Clojure/pedestal/setup.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+source $IROOT/java7.installed
 
-export LEIN_HOME=$IROOT/lein
+source $IROOT/lein.installed
 
-$LEIN_HOME/bin/lein clean
+lein clean
 
 rm -rf target
 # pack all dependencies into a single jar: target/pedestal-standalone.jar
-$LEIN_HOME/bin/lein uberjar
+lein uberjar
 # -server is much faster
 # 'lein run' passes '-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1' which make it starts fast, but runs slow
-$JAVA_HOME/bin/java -server -jar target/pedestal-standalone.jar &
+java -server -jar target/pedestal-standalone.jar &

+ 2 - 1
toolset/setup/linux/systools/leiningen.sh

@@ -8,4 +8,5 @@ fw_get https://raw.github.com/technomancy/leiningen/stable/bin/lein -O leinbin
 mv leinbin lein/bin/lein
 chmod +x lein/bin/lein
 
-touch ${IROOT}/lein.installed
+echo "export LEIN_HOME=$IROOT/lein" > $IROOT/lein.installed
+echo "export PATH=$PATH:$IROOT/lein/bin" >> $IROOT/lein.installed