# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332050189 18000
# Node ID 718abf3bec8af02d564eeb954d721d792a5afe4b
# Parent  4245109932965208fc0b9c44d323f0a81ac984e5
removed hardcoded /home/r/ strings from paths and made them relative to user.home

diff -r 424510993296 -r 718abf3bec8a clojure/com/aurellem/gb_driver.clj
--- a/clojure/com/aurellem/gb_driver.clj	Sun Mar 18 00:33:00 2012 -0500
+++ b/clojure/com/aurellem/gb_driver.clj	Sun Mar 18 00:56:29 2012 -0500
@@ -7,8 +7,10 @@
 ;; Savestates
 (defrecord SaveState [data])
 
+(def user-home (File. (System/getProperty "user.home")))
+
 (def ^:dynamic *save-state-cache*
-  (File. "/home/r/proj/pokemon-escape/save-states/"))
+  (File. user-home "proj/pokemon-escape/save-states/"))
 
 (def current-state (atom nil))
 
@@ -41,10 +43,10 @@
 (Gb/loadVBA)
 
 (def yellow-rom-image
-  (File. "/home/r/proj/pokemon-escape/roms/yellow.gbc"))
+  (File. user-home "proj/pokemon-escape/roms/yellow.gbc"))
 
 (def yellow-save-file
-  (File. "/home/r/proj/pokemon-escape/roms/yellow.sav"))
+  (File. user-home "proj/pokemon-escape/roms/yellow.sav"))
 
 (def on? (atom nil))
 
diff -r 424510993296 -r 718abf3bec8a clojure/com/aurellem/vbm.clj
--- a/clojure/com/aurellem/vbm.clj	Sun Mar 18 00:33:00 2012 -0500
+++ b/clojure/com/aurellem/vbm.clj	Sun Mar 18 00:56:29 2012 -0500
@@ -6,7 +6,7 @@
 ;;;;;;;;;;;;; read vbm file 
 
 (def ^:dynamic *moves-cache*
-  (File. "/home/r/proj/pokemon-escape/moves/"))
+     (File. user-home "proj/pokemon-escape/moves/")))
 
 (defn buttons [mask]
   (loop [buttons []
@@ -115,11 +115,12 @@
 
 (use 'clojure.java.shell)
 
+(def vba-linux (File. user-home "bin/vba-linux"))
 
 (defn play-vbm [#^File vbm]
   (.delete yellow-save-file)
   (if (.exists vbm)
-    (sh "/home/r/bin/vba-linux"
+    (sh (.getCanonicalPath vba-linux)
         (str "--playmovie=" (.getCanonicalPath vbm))
         (.getCanonicalPath yellow-rom-image)))
   nil)