fix config.dir and cache.dir javaprop passing

diff --git a/pld.patch b/pld.patch
index 5b99396e03985e6c6334c9f34f2548fd082a072f..d7c324471c1f95a00b1fe880533ef92fb7c1eadb 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,17 +1,23 @@
---- clion-140.1740.3/bin/clion.sh~     2015-01-19 20:36:22.000000000 +0200
-+++ clion-140.1740.3/bin/clion.sh      2015-01-26 21:29:17.604754268 +0200
-@@ -155,6 +155,11 @@
+--- clion-140.1740.3/bin/clion.sh      2015-01-26 21:29:17.604754268 +0200
++++ clion-2016.1.2/bin/clion.sh        2016-05-25 22:55:11.386386251 +0300
+@@ -155,6 +155,9 @@
  COMMON_JVM_ARGS="-XX:ErrorFile=$HOME/java_error_in_CL_%p.log \"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=clion10 $IDE_PROPERTIES_PROPERTY"
  IDE_JVM_ARGS="-Didea.platform.prefix=CLion -Didea.no.jre.check=true"
  
 +CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/clion"
 +CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/clion"
-+
-+IDE_JVM_ARGS="$IDE_JVM_ARGS -Dconfig.dir=$CONFIG_DIR -Dcache.dir=$CACHE_DIR"
 +
  CLASSPATH="$IDE_HOME/lib/bootstrap.jar"
  CLASSPATH="$CLASSPATH:$IDE_HOME/lib/extensions.jar"
  CLASSPATH="$CLASSPATH:$IDE_HOME/lib/util.jar"
+@@ -186,6 +189,7 @@
+   "-Xbootclasspath/a:$IDE_HOME/lib/boot.jar" \
+   -classpath "$CLASSPATH" \
+   $VM_OPTIONS \
++  -Dconfig.dir=$CONFIG_DIR -Dcache.dir=$CACHE_DIR \
+   "-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \
+   "-XX:ErrorFile=$HOME/java_error_in_CL_%p.log" \
+   "-XX:HeapDumpPath=$HOME/java_error_in_CL.hprof" \
 --- clion-2016.1.2/bin/idea.properties~        2016-05-18 00:50:46.000000000 +0300
 +++ clion-2016.1.2/bin/idea.properties 2016-05-25 18:40:32.181585904 +0300
 @@ -6,21 +6,25 @@