fix broken config/cache paths

diff --git a/pld.patch b/pld.patch
index 18ce0bc285b0201ecf464e7c20390ff7f50fc5f6..ec354cee68f8bcbc7368ccc14306b894bb70460c 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -9,7 +9,7 @@
 +
  COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=RubyMine60 $IDE_PROPERTIES_PROPERTY"
 -IDE_JVM_ARGS="-Didea.platform.prefix=Ruby -Didea.no.jre.check=true"
-+IDE_JVM_ARGS="-Didea.platform.prefix=Ruby -Didea.no.jre.check=true -Didea.config.dir=$WEBIDE_CONFIG_DIR -Didea.cache.dir=$WEBIDE_CACHE_DIR"
++IDE_JVM_ARGS="-Didea.platform.prefix=Ruby -Didea.no.jre.check=true -Drubymine.config.dir=$CONFIG_DIR -Drubymine.cache.dir=$CACHE_DIR"
  ALL_JVM_ARGS="$VM_OPTIONS $COMMON_JVM_ARGS $IDE_JVM_ARGS $AGENT $REQUIRED_JVM_ARGS"
  
  CLASSPATH="$IDE_HOME/lib/bootstrap.jar"
@@ -19,25 +19,25 @@
  # Uncomment this option if you want to customize path to IDE config folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
  # idea.config.path=${user.home}/.RubyMine/config
-+idea.config.path=${idea.config.dir}
++idea.config.path=${rubymine.config.dir}
  
  #---------------------------------------------------------------------
  # Uncomment this option if you want to customize path to IDE system folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
  # idea.system.path=${user.home}/.RubyMine/system
-+idea.system.path=${idea.cache.dir}
++idea.system.path=${rubymine.cache.dir}
  
  #---------------------------------------------------------------------
  # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
  # idea.plugins.path=${idea.config.path}/plugins
-+idea.plugins.path=${idea.config.dir}/plugins
++idea.plugins.path=${rubymine.config.dir}/plugins
  
  #---------------------------------------------------------------------
  # Uncomment this option if you want to customize path to IDE logs folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
  # idea.log.path=${idea.system.path}/log
-+idea.log.path=${idea.cache.dir}/log
++idea.log.path=${rubymine.cache.dir}/log
  
  #---------------------------------------------------------------------
  # Maximum file size (kilobytes) IDE should provide code assistance for.

diff --git a/rubymine.spec b/rubymine.spec
index 1debec9ba38fbfa8deb08200d610336f9814411d..842a78b0d3ebef6e2b3c6c91823613d291b6e84e 100644 (file)
--- a/rubymine.spec
+++ b/rubymine.spec
@@ -2,7 +2,7 @@
 Summary:       The Most Intelligent Ruby and Rails IDE
 Name:          rubymine
 Version:       6.0.3
-Release:       0.3
+Release:       0.4
 # TODO: figure out what's the licensing and redistribution
 License:       ?
 Group:         Development/Tools