[Pkg-cups-devel] r220 - cupsys/branches/cups-1.2-ubuntu/debian/local

[Martin Pitt]

Author: mpitt
Date: Tue May  9 15:37:16 2006
New Revision: 220

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing
   cupsys/branches/cups-1.2-ubuntu/debian/local/sharing_status

Log:
make sharing scripts work with "Port", too

Modified: cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing	Tue May  9 15:37:16 2006
@@ -49,9 +49,9 @@
 
 
 if [ $1 = 0 ]; then
-	sed -ri "s/^([[:space:]]*Listen[[:space:]]+)(631)([[:space:]]*(#.*)?)\$/\\1localhost:631\\3/i" $PORTSCONF
+	sed -ri "s/^[[:space:]]*(Port|Listen)[[:space:]]+631\\>/Listen localhost:631/i" $PORTSCONF
 else
-	sed -ri "s/^([[:space:]]*Listen[[:space:]]+)(localhost:631)([[:space:]]*(#.*)?)\$/\\1631\\3/i" $PORTSCONF
+	sed -ri "s/^[[:space:]]*Listen[[:space:]]+localhost:631\\>/Listen 631/i" $PORTSCONF
 fi
 	
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/local/sharing_status
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/local/sharing_status	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/sharing_status	Tue May  9 15:37:16 2006
@@ -18,7 +18,7 @@
 # if PORTSCONF is not included -> custom
 egrep -qi "^[[:space:]]*Include[[:space:]]+($PORTSCONF|$(basename $PORTSCONF))[[:space:]]*(#.*)?\$" $MAINCONF || exit 2
 
-if egrep -qi '^[[:space:]]*Listen[[:space:]]+(631)[[:space:]]*(#.*)?$' $PORTSCONF; then
+if egrep -qi '^[[:space:]]*(Port|Listen)[[:space:]]+(631)[[:space:]]*(#.*)?$' $PORTSCONF; then
     exit 1
 fi
 if egrep -qi '^[[:space:]]*Listen[[:space:]]+(localhost:631)[[:space:]]*(#.*)?$' $PORTSCONF; then