[product] Clean the launch scripts for Linux.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Mar 23, 2017 · 42e0c5e · 42e0c5e
1 parent 2a2fbe9
commit 42e0c5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/eclipse-products/io.sarl.lang.updatesite/rootfiles/linux/eclipse-sarl-archlinux.sh b/eclipse-products/io.sarl.lang.updatesite/rootfiles/linux/eclipse-sarl-archlinux.sh
@@ -9,16 +9,21 @@ if [ -r "$HOME/.eclipse/eclipserc" ]
 then
 	echo "Loading user configuration"
 	. "$HOME/.eclipse/eclipserc"
+elif [ -r "$HOME/.eclipserc" ]
+then
+	echo "Loading user configuration"
+	. "$HOME/.eclipserc"
 fi
 
 # Use GTK 2
 export SWT_GTK=0
+
 # Bug fix for overlay scrollbars
 export LIBOVERLAY_SCROLLBAR=0
 
 # Remove /usr/lib/jni from LD_LIBRARY_PATH to avoid loading from Eclipse
 export LD_LIBRARY_PATH=`echo "$LD_LIBRARY_PATH" | perl -p -e 's!(/usr/lib/jni:)|(:?/usr/lib/jni)!!'`
-
 echo "Native Library Path: $LD_LIBRARY_PATH"
+
 echo "Launching SARL IDE ${project.version}"
 exec "$CDIR/eclipse-sarl" $VMARGS "$@"
diff --git a/eclipse-products/io.sarl.lang.updatesite/rootfiles/linux/eclipse-sarl-ubuntu.sh b/eclipse-products/io.sarl.lang.updatesite/rootfiles/linux/eclipse-sarl-ubuntu.sh
@@ -9,10 +9,14 @@ if [ -r "$HOME/.eclipse/eclipserc" ]
 then
 	echo "Loading user configuration"
 	. "$HOME/.eclipse/eclipserc"
+elif [ -r "$HOME/.eclipserc" ]
+	echo "Loading user configuration"
+	. "$HOME/.eclipserc"
 fi
 
 # Bug fix for Ubuntu menu proxy
 export UBUNTU_MENUPROXY=0
+
 # Bug fix for overlay scrollbars
 export LIBOVERLAY_SCROLLBAR=0
 
@@ -22,7 +26,7 @@ export LD_LIBRARY_PATH=`echo "$LD_LIBRARY_PATH" | perl -p -e 's!(/usr/lib/jni:)|
 
 # Add Ubuntu JNI paths
 #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jni"
+#echo "Native Library Path: $LD_LIBRARY_PATH"
 
-echo "Native Library Path: $LD_LIBRARY_PATH"
 echo "Launching SARL IDE ${project.version}"
 exec "$CDIR/eclipse-sarl" $VMARGS "$@"