Skip to content
Browse files

Added ~/.cljr to classpath set in launch scripts so that ~/.cljr/user…

….clj will be evaluated.
  • Loading branch information...
1 parent 57cab91 commit a1956d032c1db7c2f4ab561cbf4c9f66bd2a5f0d @liebke committed
Showing with 10 additions and 5 deletions.
  1. +2 −2 script/install
  2. +5 −0 script/test
  3. +3 −3 src/main/resources/cljr/scripts.clj
View
4 script/install
@@ -5,6 +5,6 @@ mvn install
cd installer
lein clean && lein deps && lein uberjar
# for new version of lein
-java -jar cljr-installer-1.0.0-SNAPSHOT-standalone.jar
+#java -jar cljr-installer-1.0.0-SNAPSHOT-standalone.jar
# for old version of lein
-#java -jar cljr-installer-standalone.jar
+java -jar cljr-installer-standalone.jar
View
5 script/test
@@ -1,5 +1,8 @@
#!/bin/sh
+echo "Creating ~/.cljr/user.clj ..."
+echo "(println \"Hello from ~/.cljr/user.clj\")" > ~/.cljr/user.clj
+
echo "cljr help"
cljr help
@@ -75,3 +78,5 @@ cljr reload
echo "cljr list"
cljr list
+echo "removing ~/.cljr/user.clj ..."
+rm ~/.cljr/user.clj
View
6 src/main/resources/cljr/scripts.clj
@@ -12,7 +12,7 @@
(str "#!/bin/sh\n\n"
"USER_HOME=\"" (get-user-home) "\"\n"
"CLJR_HOME=\"" (get-cljr-home) "\"\n"
- "CLASSPATH=src" (cygwin-safe-path-sep) "test" (cygwin-safe-path-sep) ".\n\n"
+ "CLASSPATH=src" (cygwin-safe-path-sep) "test" (cygwin-safe-path-sep) "." (cygwin-safe-path-sep) (get-cljr-home) "\n\n"
" if [ ! -n \"$JVM_OPTS\" ]; then\n"
" JVM_OPTS=\"-Xmx1G\"\n"
@@ -81,7 +81,7 @@
" set CLASSPATH=!CLASSPATH!;%%a\r\n"
" )\r\n"
" set CLASSPATH=!CLASSPATH!\"\r\n"
- " set CLASSPATH=%CLASSPATH%;src;test;.\r\n"
+ " set CLASSPATH=%CLASSPATH%;src;test;.;" (get-cljr-home) "\r\n"
"goto LAUNCH\r\n\r\n"
":LAUNCH_CLJR_ONLY\r\n"
@@ -92,4 +92,4 @@
" java %JVM_OPTS% -Dinclude.cljr.repo.jars=false -Dcljr.home=" (get-cljr-home) " -Duser.home=" (get-user-home) " -Dclojure.home=%CLOJURE_HOME% -cp \"%CLASSPATH%\" cljr.App %*\r\n"
"goto EOF\r\n\r\n"
- ":EOF\r\n")))
+ ":EOF\r\n")))

0 comments on commit a1956d0

Please sign in to comment.
Something went wrong with that request. Please try again.