packages: phpstorm/pld.patch - fix location of readlink(1)
glen
glen at pld-linux.org
Thu Dec 15 15:42:52 CET 2011
Author: glen Date: Thu Dec 15 14:42:52 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix location of readlink(1)
---- Files affected:
packages/phpstorm:
pld.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/phpstorm/pld.patch
diff -u packages/phpstorm/pld.patch:1.9 packages/phpstorm/pld.patch:1.10
--- packages/phpstorm/pld.patch:1.9 Wed Dec 7 00:34:53 2011
+++ packages/phpstorm/pld.patch Thu Dec 15 15:42:47 2011
@@ -1,6 +1,15 @@
---- PhpStorm-111.19/bin/phpstorm.sh 2011-12-06 19:55:51.616124548 +0200
-+++ PhpStorm-111.19/bin/phpstorm.sh 2011-12-06 21:11:56.432592623 +0200
-@@ -134,7 +122,7 @@
+--- PhpStorm-111.19/bin/phpstorm.sh 2011-12-06 21:11:56.432592623 +0200
++++ PhpStorm-111.19/bin/phpstorm.sh 2011-12-15 16:41:37.811850204 +0200
+@@ -45,7 +45,7 @@
+ JDK="$JAVA_LOCATION"
+ fi
+ fi
+- if [ -z "$JDK" -a -x "/bin/readlink" ]; then
++ if [ -z "$JDK" -a -x "/usr/bin/readlink" ]; then
+ JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`
+ case "$JAVA_LOCATION" in
+ */jre/bin/java)
+@@ -122,7 +122,7 @@
# only extract properties (not VM options) from Info.plist
INFO_PLIST_PARSER_OPTIONS=""
else
@@ -9,7 +18,7 @@
fi
# in Mac OS X ./Contents/Info.plist describes all VM options & system properties
-@@ -144,7 +132,12 @@
+@@ -132,7 +132,12 @@
REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true -Didea.paths.selector=WebIde10 $IDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/pld.patch?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list