Build safe_asterisk script substituting the proper path in (bug #4952, patch not...
authorMark Spencer <markster@digium.com>
Sun, 14 Aug 2005 02:19:16 +0000 (02:19 +0000)
committerMark Spencer <markster@digium.com>
Sun, 14 Aug 2005 02:19:16 +0000 (02:19 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6327 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
contrib/scripts/safe_asterisk

index 737ea8e..e565d6b 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -598,7 +598,7 @@ bininstall: all
        install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
        install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/     
        if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
-               install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
+               cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
        fi
        for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
        install -d $(DESTDIR)$(ASTHEADERDIR)
index 78013c9..2cfab55 100755 (executable)
@@ -5,6 +5,7 @@ CONSOLE=yes             # Whether or not you want a console
 #NOTIFY=ben@alkaloid.net       # Who to notify about crashes
 MACHINE=`hostname`      # To specify which machine has crashed when getting the mail
 DUMPDROP=/tmp
+ASTSBINDIR=__ASTERISK_SBIN_DIR__
 #
 # Don't fork when running "safely"
 #
@@ -44,10 +45,10 @@ run_asterisk()
                if [ "$TTY" != "" ]; then
                        cd /tmp
                        stty sane < /dev/${TTY}
-                       asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
+                       ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
                else
                        cd /tmp
-                       asterisk ${CLIARGS} ${ASTARGS}
+                       ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS}
                fi
                EXITSTATUS=$?
                echo "Asterisk ended with exit status $EXITSTATUS"