Imported Upstream version 2.5.2p1

[debian/amanda] / server-src / amverifyrun.sh.in

diff --git a/server-src/amverifyrun.sh.in b/server-src/amverifyrun.sh.in
index 4404e1b06e7afd5bb327549bd3eb82ee6764d101..eeaebf6b11613617d604789cc7e225b9a75d89e0 100644 (file)
--- a/server-src/amverifyrun.sh.in
+++ b/server-src/amverifyrun.sh.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 #
 
 prefix=@prefix@
@@ -17,7 +17,7 @@ else
 fi
 
 getparm() {
-        $AMGETCONF $CONFIG $1 2>/dev/null | grep -v BUGGY
+        $AMGETCONF $CONFIG $1 2>/dev/null
 }
 
 CONFIG=$1
@@ -48,11 +48,20 @@ else
 fi
 
 
-FIRST_SLOT=`grep "taper: slot" $AMLOG | sed 1q | sed 's/://g' | awk '{print $3}'`
+FIRST_SLOT=`grep "taper: slot" $AMLOG | fgrep 'exact label match
+new tape
+first labelstr match' | sed 1q | sed 's/://g' | awk '{print $3}'`
 if [ X"$FIRST_SLOT" = X"" ]; then
-  FIRST_SLOT='-1'
+  FIRST_SLOT=`grep "taper: slot: .* wrote label" $AMLOG | sed 1q | sed 's/://g' | awk '{print $3}'`
+  if [ X"$FIRST_SLOT" = X"" ]; then
+    FIRST_SLOT='-1'
+  fi
 fi
 
-NBTAPES=`grep -c "taper: wrote label " $AMLOG`
+NBTAPES=`grep -c "taper: .*wrote label " $AMLOG`
 
-$AMVERIFY $CONFIG $FIRST_SLOT $NBTAPES
+if [ X"$NBTAPES" != X"0" ]; then
+  $AMVERIFY $CONFIG $FIRST_SLOT $NBTAPES
+else
+  echo "Nothing to verify"
+fi