[csw-devel] SF.net SVN: gar:[6949] csw/mgar/pkg/cups/branches/cups-1.4.0

[wahwah at users.sourceforge.net]

Revision: 6949
          http://gar.svn.sourceforge.net/gar/?rev=6949&view=rev
Author:   wahwah
Date:     2009-10-23 12:22:59 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
cups-1.4.0: Fixed the use of PKG_INSTALL_PATH (it doesn't have a trailing slash)

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4.0/checksums
    csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall
    csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall

Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums	2009-10-23 10:11:21 UTC (rev 6948)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums	2009-10-23 12:22:59 UTC (rev 6949)
@@ -4,7 +4,7 @@
 bbf0295c76cd06b5311ac3a3467fd431  0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
 0dd35cc0938696577104852781ec1df6  0006-Fail-compilation-if-no-SSL-impl-chosen.patch
 44ff410e237d6f4f9f0fe650ba2c7fa0  0007-Solaris-zone-support-in-init-script.patch
-dec0baa8c3ec0e171183496da8f24323  CSWcupsclient.preinstall
+cf6a3fe902545aac1ab2303e41c08a3e  CSWcupsclient.preinstall
 ca7718998e56c320c08a77cfefe046f6  CSWcupsd.postremove
-dec0baa8c3ec0e171183496da8f24323  CSWcupsd.preinstall
+cf6a3fe902545aac1ab2303e41c08a3e  CSWcupsd.preinstall
 bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2

Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall	2009-10-23 10:11:21 UTC (rev 6948)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall	2009-10-23 12:22:59 UTC (rev 6949)
@@ -4,6 +4,11 @@
 # $Id$
 #
 
+set -u
+
+PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}"
+readonly PKG_INSTALL_ROOT
+
 obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups"
 
 obsolete_dir_information="
@@ -17,7 +22,7 @@
 for dirpair in ${obsolete_directories}; do
   obsolete_dir=`echo ${dirpair} | cut -d: -f1`
   new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+  if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then
     echo
     echo "*******************************************************************"
     echo "* The old configuration directory ${obsolete_dir} still exists.    "
@@ -30,7 +35,7 @@
     sleep 10
 
     # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}"
     if touch "${fn}" 2>/dev/null; then
       echo "${obsolete_dir_information}" > "${fn}"
     fi

Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall	2009-10-23 10:11:21 UTC (rev 6948)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall	2009-10-23 12:22:59 UTC (rev 6949)
@@ -4,6 +4,11 @@
 # $Id$
 #
 
+set -u
+
+PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}"
+readonly PKG_INSTALL_ROOT
+
 obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups"
 
 obsolete_dir_information="
@@ -17,7 +22,7 @@
 for dirpair in ${obsolete_directories}; do
   obsolete_dir=`echo ${dirpair} | cut -d: -f1`
   new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+  if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then
     echo
     echo "*******************************************************************"
     echo "* The old configuration directory ${obsolete_dir} still exists.    "
@@ -30,7 +35,7 @@
     sleep 10
 
     # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}"
     if touch "${fn}" 2>/dev/null; then
       echo "${obsolete_dir_information}" > "${fn}"
     fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.