--- arduino-1.0.1/build/linux/dist/arduino.orig	2011-03-11 23:50:11.000000000 +0100
+++ arduino-1.0.1/build/linux/dist/arduino	2012-05-23 17:50:05.000000000 +0200
@@ -1,22 +1,16 @@
-#!/bin/sh
- 
-APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
-
-cd $APPDIR
- 
-for LIB in \
-    java/lib/rt.jar \
-    java/lib/tools.jar \
-    lib/*.jar \
-    ;
-do
-    CLASSPATH="${CLASSPATH}:${LIB}"
-done
-export CLASSPATH
+#!/bin/bash
 
-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
 
-export PATH="${APPDIR}/java/bin:${PATH}"
+. /usr/share/java-utils/java-functions
 
-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
+MAIN_CLASS=processing.app.Base
+ 
+set_classpath ecj jna RXTXcomm
+for lib in /usr/share/arduino/*.jar; do
+    CLASSPATH="$CLASSPATH:$lib"
+done
+ 
+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
+ 
+cd /usr/share/arduino
+run "$@"