[csw-devel] SF.net SVN: gar:[6256] csw/mgar/pkg/cups/branches/cups-1.4
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Sep 10 14:17:31 CEST 2009
Revision: 6256
http://gar.svn.sourceforge.net/gar/?rev=6256&view=rev
Author: wahwah
Date: 2009-09-10 12:17:30 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
cups: Displaying information about /etc/opt/csw in preinstall scripts. Dropping a note if appropriate.
Modified Paths:
--------------
csw/mgar/pkg/cups/branches/cups-1.4/Makefile
csw/mgar/pkg/cups/branches/cups-1.4/checksums
Added Paths:
-----------
csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall
csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall
Removed Paths:
-------------
csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall
csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall
Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 07:38:16 UTC (rev 6255)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 12:17:30 UTC (rev 6256)
@@ -27,8 +27,8 @@
PATCHFILES = 0001-Makefile.patch
DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES)
-DISTFILES += CSWcupsclient.postinstall
-DISTFILES += CSWcupsd.postinstall
+DISTFILES += CSWcupsclient.preinstall
+DISTFILES += CSWcupsd.preinstall
DISTFILES += CSWcupsd.postremove
PREREQUISITE_PKGS = CSWggettext
Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 07:38:16 UTC (rev 6255)
+++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 12:17:30 UTC (rev 6256)
@@ -1,5 +1,5 @@
682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch
-e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsclient.postinstall
-e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsd.postinstall
+8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall
ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove
+8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall
bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2
Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 07:38:16 UTC (rev 6255)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 12:17:30 UTC (rev 6256)
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
- echo
- echo "*************************************************************"
- echo "* The old configuration directory /opt/csw/etc/cups exists. *"
- echo "* Please move your configuration to /etc/opt/csw/cups. *"
- echo "*************************************************************"
- echo
- exit 1
-fi
Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall)
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-10 12:17:30 UTC (rev 6256)
@@ -0,0 +1,34 @@
+#!/bin/sh
+# vim:set sw=2 ts=2 sts=2 expandtab:
+#
+# $Id$
+#
+
+obsolete_dir_information="
+This configuration directory is obsolete. Current CUPS package is using the
+/etc/opt/csw/cups directory. Files in this directory are going to be ignored.
+Please move your configuration to /etc/opt/csw/cups.
+
+Feel free to remove this file afterwards.
+"
+obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
+
+if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
+ echo
+ echo "*******************************************************************"
+ echo "* The old configuration directory /opt/csw/etc/cups still exists. *"
+ echo "* Please move your configuration to /etc/opt/csw/cups. *"
+ echo "* *"
+ echo "* Installation will continue in 10 seconds. *"
+ echo "* Press CTRL+C if you want to stop now. *"
+ echo "*******************************************************************"
+ echo
+ sleep 10
+
+ # Leaving a note for the sysadmin if the they proceed with the installation.
+ fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}"
+ if touch "${fn}" 2>/dev/null; then
+ echo "${obsolete_dir_information}" > "${fn}"
+ fi
+ exit 0
+fi
Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 07:38:16 UTC (rev 6255)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 12:17:30 UTC (rev 6256)
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
- echo
- echo "*************************************************************"
- echo "* The old configuration directory /opt/csw/etc/cups exists. *"
- echo "* Please move your configuration to /etc/opt/csw/cups. *"
- echo "*************************************************************"
- echo
- exit 1
-fi
Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall)
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-10 12:17:30 UTC (rev 6256)
@@ -0,0 +1,34 @@
+#!/bin/sh
+# vim:set sw=2 ts=2 sts=2 expandtab:
+#
+# $Id$
+#
+
+obsolete_dir_information="
+This configuration directory is obsolete. Current CUPS package is using the
+/etc/opt/csw/cups directory. Files in this directory are going to be ignored.
+Please move your configuration to /etc/opt/csw/cups.
+
+Feel free to remove this file afterwards.
+"
+obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
+
+if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
+ echo
+ echo "*******************************************************************"
+ echo "* The old configuration directory /opt/csw/etc/cups still exists. *"
+ echo "* Please move your configuration to /etc/opt/csw/cups. *"
+ echo "* *"
+ echo "* Installation will continue in 10 seconds. *"
+ echo "* Press CTRL+C if you want to stop now. *"
+ echo "*******************************************************************"
+ echo
+ sleep 10
+
+ # Leaving a note for the sysadmin if the they proceed with the installation.
+ fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}"
+ if touch "${fn}" 2>/dev/null; then
+ echo "${obsolete_dir_information}" > "${fn}"
+ fi
+ exit 0
+fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list