| 1 |
diff -Nur netbeans-ide-launcher/ide/launcher/unix/netbeans netbeans-ide-launcher.new/ide/launcher/unix/netbeans
|
| 2 |
--- netbeans-ide-launcher/ide/launcher/unix/netbeans 2008-06-30 17:47:50.000000000 +0400
|
| 3 |
+++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans 2008-10-22 15:58:13.000000000 +0400
|
| 4 |
@@ -38,6 +38,17 @@
|
| 5 |
# Version 2 license, then the option applies only if the new code is
|
| 6 |
# made subject to such option by the copyright holder.
|
| 7 |
|
| 8 |
+# The Startup Notification Protocol Specification established by freedesktop.org
|
| 9 |
+# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
|
| 10 |
+# possible reuse by some process started later by this process, e.g. when a browser
|
| 11 |
+# will be started after clicking a hyperlink in the NetBeans.
|
| 12 |
+if [ ! -z $DESKTOP_STARTUP_ID ] ; then
|
| 13 |
+ # Save a value for later using in the NB_DESKTOP_STARTUP_ID
|
| 14 |
+ NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
|
| 15 |
+
|
| 16 |
+ unset DESKTOP_STARTUP_ID
|
| 17 |
+fi
|
| 18 |
+
|
| 19 |
#
|
| 20 |
# resolve symlinks
|
| 21 |
#
|
| 22 |
@@ -54,16 +65,18 @@
|
| 23 |
fi
|
| 24 |
done
|
| 25 |
|
| 26 |
-progdir=`dirname "$PRG"`
|
| 27 |
+#progdir=`dirname "$PRG"`
|
| 28 |
+# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
|
| 29 |
+progdir=/usr/share/netbeans/6.1/bin
|
| 30 |
|
| 31 |
if [ -f "$progdir"/../etc/netbeans.conf ] ; then
|
| 32 |
. "$progdir"/../etc/netbeans.conf
|
| 33 |
fi
|
| 34 |
|
| 35 |
# following should be done just in RPM or Solaris Launcher
|
| 36 |
-# if [ -f /etc/netbeans.conf ] ; then
|
| 37 |
-# . /etc/netbeans.conf
|
| 38 |
-# fi
|
| 39 |
+if [ -f /etc/netbeans.conf ] ; then
|
| 40 |
+ . /etc/netbeans.conf
|
| 41 |
+fi
|
| 42 |
|
| 43 |
|
| 44 |
# #68373: look for userdir, but do not modify "$@"
|
| 45 |
@@ -199,7 +212,6 @@
|
| 46 |
--branding nb \
|
| 47 |
--clusters '"$netbeans_clusters"' \
|
| 48 |
-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
|
| 49 |
- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
|
| 50 |
${netbeans_default_options} \
|
| 51 |
'"$@"'
|
| 52 |
;;
|
Parent Directory
| 
Revision Log