[Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc

Modified Files:
	Install.pm koha.upgrade 
Log Message:
etcdir not harcoded

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** Install.pm	22 Oct 2003 14:48:08 -0000	1.56
--- Install.pm	25 Oct 2003 09:53:54 -0000	1.57
***************
*** 965,970 ****
  Please press <ENTER> to continue: |;
  
! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq|
! The installer could not find the User setting in the Apache configuration file.  
  This is used to set up access permissions for
  %s/koha.conf.  This user should be set in one of the Apache configuration.
--- 965,970 ----
  Please press <ENTER> to continue: |;
  
! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\
! The installer could not find the User setting in the Apache configuration file.
  This is used to set up access permissions for
  %s/koha.conf.  This user should be set in one of the Apache configuration.
***************
*** 972,976 ****
  that "ps u|grep apache" will tell you.  It probably is NOT "root".
  
! Enter the Apache userid: |;
  
  $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq|
--- 972,976 ----
  that "ps u|grep apache" will tell you.  It probably is NOT "root".
  
! Enter the Apache userid: \;
  
  $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq|
***************
*** 993,997 ****
  			  /etc/apache-ssl/httpd.conf
  			  /etc/httpd/conf/httpd.conf
! 			  /etc/httpd/httpd.conf)) {
  	if ( -f $httpdconf ) {
  	    push @confpossibilities, $httpdconf;
--- 993,999 ----
  			  /etc/apache-ssl/httpd.conf
  			  /etc/httpd/conf/httpd.conf
! 			  /etc/httpd/httpd.conf
! 			  /etc/httpd/2.0/conf/httpd2.conf
! 			  )) {
  	if ( -f $httpdconf ) {
  	    push @confpossibilities, $httpdconf;
***************
*** 1002,1005 ****
--- 1004,1008 ----
  	my $message=getmessage('NoApacheConfFiles');
  	my $choice='';
+ 	$realhttpdconf='';
  	until (-f $realhttpdconf) {
  	    $choice=showmessage($message, "free", 1);
***************
*** 1618,1628 ****
  		system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname");
  		system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname");
- 	}
- 
- 	$result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl");
- 	if ($result) {
- 		print "Problem updating database to MARC...\n";
- 		restoremycnf();
- 		exit;
  	}
  	delete($ENV{"KOHA_CONF"});
--- 1621,1624 ----

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** koha.upgrade	20 Oct 2003 15:42:43 -0000	1.6
--- koha.upgrade	25 Oct 2003 09:53:54 -0000	1.7
***************
*** 12,15 ****
--- 12,23 ----
  }
  
+ ###############################################
+ # SET  THE  etcdir  ENVIRONMENT  VAR  INSTEAD #
+ ###############################################
+ my $etcdir = $ENV{etcdir}||'/etc';
+ system("mkdir -p $etcdir");
+ 
+ Install::setetcdir $etcdir;
+ 
  my $input;
  loadconfigfile();