Skip to content

Commit 7c91cba

Browse files
author
Federico Fissore
committed
Linux: startup script was using dropped --curdir param. Fixed
1 parent eff3b6b commit 7c91cba

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

build/linux/dist/arduino

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
#!/usr/bin/env bash
22

3-
CURDIR=`pwd`
43
APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
54

6-
cd "$APPDIR"
7-
85
for LIB in \
9-
java/lib/rt.jar \
10-
java/lib/tools.jar \
11-
lib/*.jar \
6+
$APPDIR/java/lib/rt.jar \
7+
$APPDIR/java/lib/tools.jar \
8+
$APPDIR/lib/*.jar \
129
;
1310
do
1411
CLASSPATH="${CLASSPATH}:${LIB}"
1512
done
1613
export CLASSPATH
1714

18-
LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
15+
LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
1916
export LD_LIBRARY_PATH
2017

2118
export PATH="${APPDIR}/java/bin:${PATH}"
2219

2320
if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
2421
SPLASH=""
2522
else
26-
SPLASH="-splash:./lib/splash.png"
23+
SPLASH="-splash:$APPDIR/lib/splash.png"
2724
fi
2825

2926
export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
3027

3128
JAVA=java
32-
if [ -x ./java/bin/java ]; then
33-
JAVA=./java/bin/java
29+
if [ -x $APPDIR/java/bin/java ]; then
30+
JAVA=$APPDIR/java/bin/java
3431
fi
3532

36-
$JAVA -DAPP_DIR="$APPDIR" -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir "$CURDIR" "$@"
33+
$JAVA -DAPP_DIR="$APPDIR" -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base "$@"
3734

0 commit comments

Comments
 (0)