Author: js Date: 2008-08-14 21:17:53 +0200 (Thu, 14 Aug 2008) New Revision: 10245
Modified: trunk/launch.sh trunk/scripts/gajim-remote.in trunk/scripts/gajim.in Log: Fully POSIX-compliant shell scripts.
Modified: trunk/launch.sh =================================================================== --- trunk/launch.sh 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/launch.sh 2008-08-14 19:17:53 UTC (rev 10245) @@ -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 $@
Modified: trunk/scripts/gajim-remote.in =================================================================== --- trunk/scripts/gajim-remote.in 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/scripts/gajim-remote.in 2008-08-14 19:17:53 UTC (rev 10245) @@ -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@
Modified: trunk/scripts/gajim.in =================================================================== --- trunk/scripts/gajim.in 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/scripts/gajim.in 2008-08-14 19:17:53 UTC (rev 10245) @@ -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@