From 7c91cbaf553f78a417c388ccdb856533889b1f53 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Tue, 30 Jun 2015 09:07:02 +0200
Subject: [PATCH] Linux: startup script was using dropped --curdir param. Fixed

---
 build/linux/dist/arduino | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index 48bf7456a..178766745 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -1,21 +1,18 @@
 #!/usr/bin/env bash
 
-CURDIR=`pwd`
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
 
-cd "$APPDIR"
-
 for LIB in \
-    java/lib/rt.jar \
-    java/lib/tools.jar \
-    lib/*.jar \
+    $APPDIR/java/lib/rt.jar \
+    $APPDIR/java/lib/tools.jar \
+    $APPDIR/lib/*.jar \
     ;
 do
     CLASSPATH="${CLASSPATH}:${LIB}"
 done
 export CLASSPATH
 
-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"
@@ -23,15 +20,15 @@ export PATH="${APPDIR}/java/bin:${PATH}"
 if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
 	SPLASH=""
 else
-	SPLASH="-splash:./lib/splash.png"
+	SPLASH="-splash:$APPDIR/lib/splash.png"
 fi
 
 export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
 
 JAVA=java
-if [ -x ./java/bin/java ]; then
-  JAVA=./java/bin/java
+if [ -x $APPDIR/java/bin/java ]; then
+  JAVA=$APPDIR/java/bin/java
 fi
 
-$JAVA -DAPP_DIR="$APPDIR" -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir "$CURDIR" "$@"
+$JAVA -DAPP_DIR="$APPDIR" -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base "$@"