[packages/phpstorm] pass options directly

glen glen at pld-linux.org
Mon Mar 21 13:42:24 CET 2016


commit 8c9cf93b54dc64476d15286853f2d01041d806c8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Mar 21 14:39:00 2016 +0200

    pass options directly
    
    avoids quoting issue caused by mksh

 pld.patch | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/pld.patch b/pld.patch
index 77ebb3a..7cca487 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,25 +1,23 @@
---- PhpStorm-145.258.2/bin/phpstorm.sh~	2016-03-16 17:03:50.000000000 +0200
+--- PhpStorm-145.258.2/bin/phpstorm.sh	2016-03-21 11:05:59.385371297 +0200
 +++ PhpStorm-145.258.2/bin/phpstorm.sh	2016-03-21 11:05:59.385371297 +0200
-@@ -178,6 +178,11 @@
+@@ -178,6 +178,9 @@
    CLASSPATH="$CLASSPATH:$WEBIDE_CLASSPATH"
  fi
  
 +WEBIDE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/PhpStorm"
 +WEBIDE_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/PhpStorm"
 +
-+IDE_JVM_ARGS="-Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR"
-+
  # ---------------------------------------------------------------------
  # Run the IDE.
  # ---------------------------------------------------------------------
-@@ -193,6 +198,7 @@
-   -Djb.restart.code=88 -Didea.paths.selector=PhpStorm2016.1 \
-   $IDE_PROPERTIES_PROPERTY \
-   -Didea.platform.prefix=PhpStorm \
-+  $IDE_JVM_ARGS \
-   com.intellij.idea.Main \
-   "$@"
- EC=$?
+@@ -187,6 +190,7 @@
+   "-Xbootclasspath/a:$IDE_HOME/lib/boot.jar" \
+   -classpath "$CLASSPATH" \
+   $VM_OPTIONS \
++  -Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR \
+   "-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \
+   "-XX:ErrorFile=$HOME/java_error_in_WEBIDE_%p.log" \
+   "-XX:HeapDumpPath=$HOME/java_error_in_WEBIDE.hprof" \
 --- PhpStorm-145.258.2/bin/idea.properties~	2016-03-16 17:02:05.000000000 +0200
 +++ PhpStorm-145.258.2/bin/idea.properties	2016-03-21 11:07:02.191952728 +0200
 @@ -6,21 +6,25 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpstorm.git/commitdiff/8c9cf93b54dc64476d15286853f2d01041d806c8



More information about the pld-cvs-commit mailing list