Author: ruschein
Date: 2010-10-11 09:25:17 -0700 (Mon, 11 Oct 2010)
New Revision: 22198

Modified:
   cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
   cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
Log:
We now put Cytoscape.vmoptions in .cytoscape.

Modified: cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/cytoscape.sh      2010-10-10 
23:22:42 UTC (rev 22197)
+++ cytoscape/trunk/distribution/src/main/bin/cytoscape.sh      2010-10-11 
16:25:17 UTC (rev 22198)
@@ -12,7 +12,7 @@
 fi
 
 if [ -r Cytoscape.vmoptions ]; then
-    java `cat "$script_path/Cytoscape.vmoptions"` -jar 
"$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"
+    java `cat "$HOME/.cytoscape/Cytoscape.vmoptions"` -jar 
"$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"
 else # Just use sensible defaults.
     java -d64 -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M 
-Xmx1550M \
        -jar "$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"

Modified: cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh  2010-10-10 
23:22:42 UTC (rev 22197)
+++ cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh  2010-10-11 
16:25:17 UTC (rev 22198)
@@ -1,19 +1,23 @@
 #!/bin/sh
 # Generates the Cytoscape.vmoptions file
 
-script_path="$(dirname -- $0)"
+dot_cytoscape_path="$HOME/.cytoscape"
 
+if [ ! -e $dot_cytoscape_path ]; then
+    /bin/mkdir $dot_cytoscape_path
+fi
+
 if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then # We have a 64 bit 
JVM.
-    echo -Xms20m >  "$script_path/Cytoscape.vmoptions"
-    echo -Xmx20g >> "$script_path/Cytoscape.vmoptions"
-    echo -d64       >> "$script_path/Cytoscape.vmoptions"
+    echo -Xms20m >  "$dot_cytoscape_path/Cytoscape.vmoptions"
+    echo -Xmx20g >> "$dot_cytoscape_path/Cytoscape.vmoptions"
+    echo -d64       >> "$dot_cytoscape_path/Cytoscape.vmoptions"
 else # Assume a 32 bit JVM.
-    echo -Xms10m   >  "$script_path/Cytoscape.vmoptions"
-    echo -Xmx1550m >> "$script_path/Cytoscape.vmoptions"
+    echo -Xms10m   >  "$dot_cytoscape_path/Cytoscape.vmoptions"
+    echo -Xmx1550m >> "$dot_cytoscape_path/Cytoscape.vmoptions"
 fi
 
 # Shared JVM options
-echo -Dswing.aatext=true               >> "$script_path/Cytoscape.vmoptions"
-echo -Dawt.useSystemAAFontSettings=lcd >> "$script_path/Cytoscape.vmoptions"
+echo -Dswing.aatext=true               >> 
"$dot_cytoscape_path/Cytoscape.vmoptions"
+echo -Dawt.useSystemAAFontSettings=lcd >> 
"$dot_cytoscape_path/Cytoscape.vmoptions"
 
 exit 0

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to