Command line printer manipulation client, and build goo.

[moira.git] / gen / cups-print.sh

diff --git a/gen/cups-print.sh b/gen/cups-print.sh
index c8d6f6bd997a3632bf84af3b5a6c778348c0d284..3c33e9500747a05c163901b5ee0903c1cca9f7a2 100755 (executable)
--- a/gen/cups-print.sh
+++ b/gen/cups-print.sh
@@ -21,19 +21,38 @@ CUPSLOCAL=/etc/cups
 test -r $TARFILE || exit $MR_MISSINGFILE
 test -d $CUPSLOCAL || exit $MR_MISSINGFILE
 
+# We need to kill off CUPS to prevent it from overwriting
+# state data whilst updating
+/etc/init.d/cups stop
+
+/etc/cups/bin/check-disabled.pl 2>/dev/null
+
 # Unpack the tar file, getting only files that are newer than the
 # on-disk copies (-u).
 cd /
 tar xf $TARFILE || exit $MR_TARERR
 
-# Now, make a stab at the PPD file.
+/etc/cups/bin/post-dcm-disable.pl 2>/dev/null
+if [ -s /etc/cups/printers.conf.tmp ]; then
+    mv /etc/cups/printers.conf.tmp /etc/cups/printers.conf
+fi
+
+/etc/init.d/cups start
+
+# Now, make a stab at the PPD file.  This is okay to run after
+# because CUPS will pick up the new PPDs later
 /etc/cups/bin/gen-ppd.pl
 
-/etc/init.d/cupsys restart
 if [ $? != 0 ]; then
     exit $MR_MKCRED
 fi
 
+# if Samba-enabled, then restart it too to have it pick up
+# new definitions
+if [ -x /etc/init.d/smb ]; then
+       /etc/init.d/smb restart
+fi
+
 # cleanup
 test -f $TARFILE && rm -f $TARFILE
 test -f $0 && rm -f $0