[csw-devel] SF.net SVN: gar:[6918] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf

[wahwah at users.sourceforge.net]

Revision: 6918
          http://gar.svn.sourceforge.net/gar/?rev=6918&view=rev
Author:   wahwah
Date:     2009-10-20 16:37:06 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
cswmigrateconf: fixing an issue with the way PKG_INSTALL_ROOT is used (it doesn't have a trailing slash)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf	2009-10-20 15:50:00 UTC (rev 6917)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf	2009-10-20 16:37:06 UTC (rev 6918)
@@ -14,7 +14,9 @@
 # Print errors when trying to read from an unset variable.
 set -u
 
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/}
+# PKG_INSTALL_ROOT does not have a trailing slash. It's for instance: /a
+# http://docs.sun.com/app/docs/doc/820-4042/package-2?a=view
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-}
 readonly PKG_INSTALL_ROOT
 
 return_code=0
@@ -34,7 +36,7 @@
 readonly deprecated_file_ext
 
 # Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script
-if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then
+if [ -r ${PKG_INSTALL_ROOT}/etc/opt/csw/cswclassutils.DEBUG ]; then
   DEBUG=1
 else
   DEBUG=0
@@ -168,11 +170,11 @@
   fi
 
   # The defaults, if not set already by the script.
-  SOURCE_DIR___default__="${SOURCE_DIR___default__:-opt/csw/etc}"
+  SOURCE_DIR___default__="${SOURCE_DIR___default__:-/opt/csw/etc}"
   readonly SOURCE_DIR___default__
-  ARCH_DIR___default__="${ARCH_DIR___default__:-opt/csw/etc/migration-archive}"
+  ARCH_DIR___default__="${ARCH_DIR___default__:-/opt/csw/etc/migration-archive}"
   readonly ARCH_DIR___default__
-  DEST_DIR___default__="${DEST_DIR___default__:-etc/opt/csw}"
+  DEST_DIR___default__="${DEST_DIR___default__:-/etc/opt/csw}"
   readonly DEST_DIR___default__
 
   for file_name in ${MIGRATE_FILES}; do


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