--- arduino	2010-09-04 00:43:29.000000000 +0100
+++ build/linux/dist/arduino	2010-09-06 01:48:15.000000000 +0100
@@ -1,22 +1,15 @@
-#!/bin/sh
+#!/bin/bash
  
-APPDIR="$(dirname -- "${0}")"
+. /usr/share/java-utils/java-functions
 
-cd $APPDIR
- 
-for LIB in \
-    java/lib/rt.jar \
-    java/lib/tools.jar \
-    lib/*.jar \
-    ;
-do
-    CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}"
-done
-export CLASSPATH
+MAIN_CLASS=processing.app.Base
 
-LD_LIBRARY_PATH=`pwd`/lib:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+set_classpath ecj jna oro RXTXcomm
+for lib in /usr/share/arduino/*.jar; do
+    CLASSPATH="$CLASSPATH:$lib"
+done
 
-export PATH="${APPDIR}/java/bin:${PATH}"
+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
 
-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
+cd /usr/share/arduino
+run "$@"