From 7944990a1b8b107e5c76831cd66ceed23d7c314d Mon Sep 17 00:00:00 2001
From: js <js-gajim@webkeks.org>
Date: Thu, 14 Aug 2008 19:17:53 +0000
Subject: [PATCH] Fully POSIX-compliant shell scripts.

---
 launch.sh               | 17 +----------------
 scripts/gajim-remote.in |  3 ++-
 scripts/gajim.in        |  3 ++-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/launch.sh b/launch.sh
index d526d23cd..f61870f69 100755
--- a/launch.sh
+++ b/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 $@
diff --git a/scripts/gajim-remote.in b/scripts/gajim-remote.in
index f107fe428..8d771a1c6 100644
--- a/scripts/gajim-remote.in
+++ b/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@
diff --git a/scripts/gajim.in b/scripts/gajim.in
index 29e726373..a627ce637 100644
--- a/scripts/gajim.in
+++ b/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@