Index: arduino-1.6.5/build/linux/dist/arduino
===================================================================
--- arduino-1.6.5/build/linux/dist/arduino
+++ arduino-1.6.5/build/linux/dist/arduino	2015-08-18 02:27:19.387968625 +0200
@@ -13,25 +13,12 @@
     fi
 fi
 
-CURDIR=`pwd`
-APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
-
-cd "$APPDIR"
-
-for LIB in \
-    java/lib/rt.jar \
-    java/lib/tools.jar \
-    lib/*.jar \
-    ;
-do
-    CLASSPATH="${CLASSPATH}:${LIB}"
+. /usr/share/java-utils/java-functions
+MAIN_CLASS=processing.app.Base
+set_classpath bcprov bcpg commons-codec commons-compress commons-exec commons-httpclient commons-lang3 commons-logging ecj guava jackson-annotations jackson-core jackson-databind jackson-modules-base jmdns jna jsch jsemver jssc objectweb-asm rsyntaxtextarea
+for lib in /usr/share/arduino/lib/*.jar; do
+    CLASSPATH="$CLASSPATH:$lib"
 done
-export CLASSPATH
-
-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
-
-export PATH="${APPDIR}/java/bin:${PATH}"
 
 if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
 	SPLASH=""
@@ -41,9 +28,6 @@
 
 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
-fi
-
-$JAVA -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir "$CURDIR" "$@"
+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH
+cd /usr/share/arduino
+run "$@"