Fully POSIX-compliant shell scripts.

launch.sh

@@ -1,18 +1,3 @@
 #!/bin/sh
-if [[ $0 == /* ]]; then
-	BASE=`dirname $0`
-else
-	BASE=`pwd`/`dirname $0`
-fi
-OS=`uname -s`
-
-if [ "x${OS}" == "xDarwin" ]; then
-    export RESOURCEPATH="${BASE}/dist/Gajim.app/Contents/Resources"
-    GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current"
-    export PATH="${GTK_DIR}/bin:$PATH"
-    export PYTHONPATH="${GTK_DIR}/lib/python2.5/site-packages:${GTK_DIR}/lib/python2.5/site-packages/gtk-2.0:${PYTHONPATH}"
-    unset GTK_DIR
-fi
-
-cd ${BASE}/src
+cd "$(dirname $0)/src"
 exec python -t gajim.py $@

scripts/gajim-remote.in

@@ -24,8 +24,9 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
-if [ `id -u` -eq 0 ]; then
+if test $(id -u) -eq 0; then
 	echo "You must not launch gajim-remote as root, it is INSECURE"
+	exit 1
 fi
 
 datadir=@DATADIR@

scripts/gajim.in

@@ -23,8 +23,9 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
-if [ `id -u` -eq 0 ]; then
+if test $(id -u) -eq 0; then
 	echo "You must not launch Gajim as root, it is INSECURE"
+	exit 1
 fi
 
 datadir=@DATADIR@