diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-21 18:00:12 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-21 18:00:12 +0000 |
| commit | f04d659eafdb78d6db7ef361e72db9aae8fc3536 (patch) | |
| tree | 0e70e4d5c95e6ee5990072d349a6e53e89a956af /build_tools | |
| parent | f7e14ee01304f4c6c520659adca6caff3a0ea184 (diff) | |
live_dahdi: Better handling of a non-existing TOOLS_DIR
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7172 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/live_dahdi | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/build_tools/live_dahdi b/build_tools/live_dahdi index b1ff8d6..2445944 100755 --- a/build_tools/live_dahdi +++ b/build_tools/live_dahdi @@ -1,10 +1,7 @@ #!/bin/sh -set -e - LINUX_DIR=${LINUX_DIR:=.} -LINUX_DIR_FULL=`(cd $LINUX_DIR; pwd)` -TOOLS_DIR=${TOOLS_DIR:=`(cd ../dahdi-tools; pwd)`} +TOOLS_DIR=${TOOLS_DIR:=../dahdi-tools} DESTDIR=$PWD/live KVERS=${KVERS:-`uname -r`} MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi" @@ -25,6 +22,19 @@ REMOVE_MODULES="dahdi" # "dahdi oslec"? if [ -r $DESTDIR/live.conf ]; then . $DESTDIR/live.conf; fi +if [ ! -d "$LINUX_DIR" ]; then + echo >&2 "$0:dahdi-linux dir '$LINUX_DIR' does not exits. Aborting". + exit 1 +fi + +if [ ! -d "$TOOLS_DIR" ]; then + echo >&2 "$0:dahdi-tools dir '$TOOLS_DIR' does not exits. Aborting". + exit 1 +fi +set -e +LINUX_DIR_FULL=`(cd $LINUX_DIR; pwd)` +TOOLS_DIR_FULL=`(cd $TOOLS_DIR; pwd)` + # Give priority to our installed binaries: PATH=$DESTDIR/sbin:$DESTDIR/usr/sbin:$PATH export PATH @@ -96,7 +106,7 @@ xpp_startup() { if ! grep -q connected /proc/xpp/xbuses 2>/dev/null; then return 0; fi echo "Waiting for Astribank devices to initialize:" - $TOOLS_DIR/xpp/waitfor_xpds # Asusmes a recent dahdi-tools + $TOOLS_DIR_FULL/xpp/waitfor_xpds # Asusmes a recent dahdi-tools # overriding locales for the above two, as perl can be noisy # when locales are missing. @@ -159,7 +169,7 @@ configure) install) shift cd "$LINUX_DIR"; make install DESTDIR=$DESTDIR "$@" - cd "$TOOLS_DIR"; make install DESTDIR=$DESTDIR DYNFS=yes "$@" + cd "$TOOLS_DIR_FULL"; make install DESTDIR=$DESTDIR DYNFS=yes "$@" ;; config) shift @@ -229,7 +239,7 @@ xpp-firm) XPP_FIRMWARE_DIR=$FIRMWARE_DIR \ sh "$TOOLS_DIR"/xpp/xpp_fxloader load ;; -help) +help|'') usage ;; *) |