[Fedora-directory-commits] ldapserver/ldap/cm/newinst ns-update, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/cm/newinst

Modified Files:
	ns-update 
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components.  I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build.  This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ns-update	19 Apr 2005 22:07:20 -0000	1.6
+++ ns-update	3 Oct 2005 19:53:54 -0000	1.7
@@ -63,11 +63,13 @@
 install_nsperl()
 {
 	# the current version of nsPerl to use is defined in the slapd.inf
-	nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d=`
-	# run the nsperl installer
-	$nsperlinst > setup/nsperl/install.log
-	# use nsperl as our local copy of perl
-	cp `dirname $nsperlinst`/nsperl $PERL
+	nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
+	if [ "$nsperlinst" ]; then
+		# run the nsperl installer
+		$nsperlinst > setup/nsperl/install.log
+		# use nsperl as our local copy of perl
+		cp `dirname $nsperlinst`/nsperl $PERL
+	fi
 }
 
 wrap_security_tools()
@@ -176,13 +178,8 @@
 cd `dirname $0`
 
 rc=0
-if [ "$iDSISolaris" = "" ]; then  
-	./ds_create $* $extraflags
-	rc=$?
-else
-	$PERL -w Install.pl $* $extraflags
-	rc=$?
-fi
+./ds_create $* $extraflags
+rc=$?
 
 if [ -f fix_secmod_db_64 ]; then
     ./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin