Hatch window bat script continued

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/hatch.bat b/hatch.bat
index 279d6e4..d96c2ff 100755 (executable)
--- a/hatch.bat
+++ b/hatch.bat
@@ -2,34 +2,32 @@
 REM Windows Hatch Execution Script
 REM @echo off required for STDIO to work with the browser.
 SET JAVA_HOME="C:\Program Files\Java\jdk1.8.0_111"
-SET JAVA="%JAVA_HOME%\bin\java"
-SET JAVAC="%JAVA_HOME%\bin\javac"
+SET JAVA=%JAVA_HOME%\bin\java
+SET JAVAC=%JAVA_HOME%\bin\javac
 
-IF EXIST "%1" (
+IF "%1" == "compile" (
 
-    IF "%1" == "compile" (
-        %JAVAC% -cp "lib\*" -Xdiags:verbose^
-            -d lib src\org\evergreen_ils\hatch\*.java
-    ) 
+    %JAVAC% -cp "lib\*" -Xdiags:verbose^
+        -d lib src\org\evergreen_ils\hatch\*.java
+
+) ELSE (
 
     IF "%1" == "test" (
 
         %JAVA% -cp "lib\*;lib"^
-               -Djava.util.logging.config.file=logging.properties^
-            org.evergreen_ils.hatch.TestHatch^
-            | %JAVA% -cp "lib\*;lib"^ 
-               -Djava.util.logging.config.file=logging.properties^
-            org.evergreen_ils.hatch.Hatch^ 
-            | %JAVA% -cp "lib\*;lib"^ 
-               -Djava.util.logging.config.file=logging.properties^
+            -Djava.util.logging.config.file=logging.properties^
+            org.evergreen_ils.hatch.TestHatch | %JAVA% -cp "lib\*;lib"^
+            -Djava.util.logging.config.file=logging.properties^
+            org.evergreen_ils.hatch.Hatch | %JAVA% -cp "lib\*;lib"^
+            -Djava.util.logging.config.file=logging.properties^
             org.evergreen_ils.hatch.TestHatch receive
-    )
 
-) ELSE (
+    ) ELSE ( REM No options means run Hatch
 
-    %JAVA% -cp "lib\*;lib"^
-           -Djava.util.logging.config.file=logging.properties^
-           org.evergreen_ils.hatch.Hatch
-)
+        %JAVA% -cp "lib\*;lib"^
+            -Djava.util.logging.config.file=logging.properties^
+            org.evergreen_ils.hatch.Hatch
 
+    )
+)
 

diff --git a/logging.properties b/logging.properties
index 8aab437..566df9a 100644 (file)
--- a/logging.properties
+++ b/logging.properties
@@ -7,7 +7,7 @@ java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS %4$
 java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
 
 # log files go to $SYSTEM_TMP/hatch.log
-java.util.logging.FileHandler.pattern = %t/hatch.log
+java.util.logging.FileHandler.pattern = %h/.evergreen/hatch.log
 java.util.logging.FileHandler.limit = 50000
 
 # Log everything everywhre