[dahdi-commits] tzafrir: linux/trunk r7172 - /linux/trunk/build_tools/live_dahdi

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Mon Sep 21 13:00:12 2009
New Revision: 7172

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=7172
Log:
live_dahdi: Better handling of a non-existing TOOLS_DIR

Modified:
    linux/trunk/build_tools/live_dahdi

Modified: linux/trunk/build_tools/live_dahdi
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/build_tools/live_dahdi?view=diff&rev=7172&r1=7171&r2=7172
==============================================================================
--- linux/trunk/build_tools/live_dahdi (original)
+++ linux/trunk/build_tools/live_dahdi Mon Sep 21 13:00:12 2009
@@ -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"
@@ -24,6 +21,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
@@ -96,7 +106,7 @@
 	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 @@
 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_FIRMWARE_DIR=$FIRMWARE_DIR \
 		sh "$TOOLS_DIR"/xpp/xpp_fxloader load
 	;;
-help)
+help|'')
 	usage
 	;;
 *)