From c65ca12487061a285f2568dd748f26c44cee8858 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 2 Jun 2009 13:47:11 +0000 Subject: [PATCH] Monotone-Parent: 52ed7c612278254b79fdf946b5a0b54fe032dad4 Monotone-Revision: 1998a97de11b63460cd6ecf4448985e926b5d6d7 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-06-02T13:47:11 Monotone-Branch: ca.inverse.sogo --- Scripts/sogo-init.d-debian | 12 ++++++------ Scripts/sogod-wrapper | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian index 57748d52e..24bf28d34 100755 --- a/Scripts/sogo-init.d-debian +++ b/Scripts/sogo-init.d-debian @@ -44,18 +44,18 @@ if [ ! -x $DAEMON ]; then exit 1 fi -if [ `/usr/bin/stat /var/run/sogo -c %U` != "sogo" ]; then - echo "/var/run/sogo is not owned by the sogo user." +if [ `/usr/bin/stat /var/run/sogo -c %U` != $USER ]; then + echo "/var/run/sogo is not owned by the ${USER}." exit 1 fi -if [ `/usr/bin/stat /var/spool/sogo -c %U` != "sogo" ]; then - echo "/var/spool/sogo is not owned by the sogo user." +if [ `/usr/bin/stat /var/spool/sogo -c %U` != $USER ]; then + echo "/var/spool/sogo is not owned by the ${USER}." exit 1 fi -if [ `/usr/bin/stat /var/log/sogo -c %U` != "sogo" ]; then - echo "/var/log/sogo is not owned by the sogo user." +if [ `/usr/bin/stat /var/log/sogo -c %U` != $USER ]; then + echo "/var/log/sogo is not owned by the ${USER}." exit 1 fi diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper index f834e7f98..bb2eeb5be 100755 --- a/Scripts/sogod-wrapper +++ b/Scripts/sogod-wrapper @@ -40,7 +40,9 @@ else exit 1 fi -if [ -x $GNUSTEP_LOCAL_ADMIN_TOOLS/sogod ]; then +if [ -x $HOME/$GNUSTEP_USER_DIR_ADMIN_TOOLS/sogod ]; then + sogod="$HOME/$GNUSTEP_USER_DIR_ADMIN_TOOLS/sogod" +elif [ -x $GNUSTEP_LOCAL_ADMIN_TOOLS/sogod ]; then sogod="$GNUSTEP_LOCAL_ADMIN_TOOLS/sogod" elif [ -x $GNUSTEP_SYSTEM_ADMIN_TOOLS/sogod ]; then sogod="$GNUSTEP_SYSTEM_ADMIN_TOOLS/sogod"