Changeset 1706

Timestamp:

09/07/04 16:17:19 (20 years ago)

Author:

jalet

Message:

Small addition to catch SIGTERM. Doesn't currently help, though, so needs
more work.

Files:

• pykota/trunk/bin/waitprinter.sh (modified) (3 diffs)

pykota/trunk/bin/waitprinter.sh

@@ -16 +16 @@
 # Fix by Matt Hyclak & Jerome Alet
 
+trap "KILLED=1" TERM
+
 # If ending phase, after the job has been fully transmitted to the printer
 # we have to wait for the printer being in printing mode before checking
@@ -22 +24 @@
 if [ x$PYKOTAACTION != "xDENY" ] && [ x$PYKOTAPHASE = "xAFTER" ] ; then
   until snmpget -v1 -c public -Ov $1 HOST-RESOURCES-MIB::hrPrinterStatus.1 | grep -i printing >/dev/null; do
-   sleep 1 ;
+    if [ "$KILLED" = 1 ]; then
+      break ;
+    fi 
+    sleep 1 ;
   done
 fi
@@ -28 +33 @@
 # In any case, wait until the printer is idle again.
 until snmpget -v1 -c public -Ov $1 HOST-RESOURCES-MIB::hrPrinterStatus.1 | grep -i idle >/dev/null ; do 
+  if [ "$KILLED" = 1 ]; then
+    break ;
+  fi 
   sleep 1 ;
 done
-