some fixes related to python

git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@35 dbf6933d-3bce-0310-9bcc-ed052ba35b35

3 files changed, 14 insertions, 13 deletions

diff --git a/clients/ivam-autobox b/clients/ivam-autobox
index 49eaf22..0d06074 100755
--- a/clients/ivam-autobox
+++ b/clients/ivam-autobox
@@ -22,7 +22,6 @@ import sys, os, getopt
 
 from ivamCore import log
 import ivamCore, ivamVoiceBox
-from optparse import OptionParser
 
 def usage():
     log("%s [--record-time=SECS] [--pin=PIN] [--pin-file=PINFILE] [--default-record-time=SECS] [--default-pin=PIN] [--default-pin-file=PINFILE] [--record-only] [--no-record] [--debug] [--notify-script=PATH] [--email=EMAIL] [DIRECTORY]" % sys.argv[0])
diff --git a/conf/Makefile.am b/conf/Makefile.am
index e5460ee..a8c551f 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = ivam2.init.in $(pkgsysconf_DATA)
 CLEANFILES = ivam2.init
 
 ivam2.init: ivam2.init.in Makefile
-	sed -e 's,@pkgsysconfdir\@,$(sysconfdir)/@PACKAGE@,g' -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	sed -e 's,@pkgsysconfdir\@,$(sysconfdir)/@PACKAGE@,g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@pythondir\@,$(pythondir),g' $< > $@
 	chmod 755 $@
 
 install-data-local: ivam2.init
diff --git a/conf/ivam2.init.in b/conf/ivam2.init.in
index 680d210..6922efc 100755
--- a/conf/ivam2.init.in
+++ b/conf/ivam2.init.in
@@ -17,40 +17,42 @@
 # along with ivam2; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-CFG=@pkgsysconfdir@/ivam2.conf
+CFG="@pkgsysconfdir@/ivam2.conf"
 
-IVAMD=@sbindir@/ivamd
-test -x $IVAMD || exit 0
+IVAMD="@sbindir@/ivamd"
+test -x "$IVAMD" || exit 0
 
 if [ `id -u` != "0" ] && [ "$1" = "start" -o "$1" = "stop" ] ; then
   echo "You must be root to start, stop or restart ivamd."
   exit 1
 fi
 
-[ -f $CFG ] && . $CFG
+[ -f "$CFG" ] && . "$CFG"
 
 case "$1" in
     start)
         echo -n "Starting ISDN Voice Box Answering Machine: "
-        $IVAMD "$ARGS" && echo "ivamd"
+        PYTHONPATH="@pythondir@" "$IVAMD" "$ARGS" && echo "ivamd"
         ;;
+
     stop)
         echo -n "Stopping ISDN Voice Box Answering Machine: "
-        $IVAMD -k && ( rm -f /var/run/ivamd.pid ; echo "ivamd" )
-        
+        "$IVAMD" -k && ( rm -f /var/run/ivamd.pid ; echo "ivamd" )
         ;;
+
     status)
-        $IVAMD -c
+        "$IVAMD" -c
         ;;
+
     reload)
         echo -n "Reloading ISDN Voice Box Answering Machine: "
-        $IVAMD --reload && echo "ivamd"
+        "$IVAMD" --reload && echo "ivamd"
         ;;
 
     force-reload|restart)
-        $0 stop
+        "$0" stop
         sleep 3
-        $0 start
+        "$0" start
         ;;
     *)
         echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"