diff -r f54aca534513 ide/launcher/unix/netbeans --- a/ide/launcher/unix/netbeans Tue May 29 12:40:22 2012 +0200 +++ b/ide/launcher/unix/netbeans Tue May 29 18:59:30 2012 +0200 @@ -58,6 +58,9 @@ done progdir=`dirname "$PRG"` +cd "$progdir"/.. +basedir=`pwd` +cd - case "`uname`" in Darwin*) @@ -118,26 +121,12 @@ fi readClusters() { - grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep -v platform | while read X; do - if expr "$X" : "/.*" >/dev/null; then - echo "$X" - else - echo "$progdir/../$X" - fi + grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | while read X; do + echo "$basedir/$X" done } -absolutize_paths() { - while read path; do - if [ -d "$path" ]; then - (cd "$path" 2>/dev/null && pwd) - else - echo "$path" - fi - done -} - -netbeans_clusters=`readClusters | absolutize_paths | tr '\012' ':'` +netbeans_clusters=`readClusters | tr '\012' ':'` if [ ! -z "$netbeans_extraclusters" ] ; then netbeans_clusters="$netbeans_clusters:$netbeans_extraclusters"