aboutsummaryrefslogtreecommitdiff
path: root/www/bricolage/files/patch-bin::bric_pgimport
blob: 987d818529adaf11e1aae6acccbe77ce9b2743e7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
*** bin/bric_pgimport.orig	Sun Feb 29 15:11:56 2004
--- bin/bric_pgimport	Tue Jun  1 22:55:42 2004
***************
*** 33,41 ****
  
  =item -w
  
! The directory with the CVS SQL files. Defaults to lib subdirectory of
! BRICOLAGE_ROOT environment variable, which itself defaults to
! F</usr/local/bricolage>.
  
  =item -u
  
--- 33,40 ----
  
  =item -w
  
! The directory with the Bricolage SQL files. Defaults to 
! F</usr/local/share/bricolage>.
  
  =item -u
  
***************
*** 189,198 ****
  
      if ($opt_w) {
          # Add on the location of the SQL.
!         $opt_w = catdir($opt_w, 'sql', DBD);
      } else {
! 	$ENV{BRICOLAGE_ROOT} ||= '/usr/local/bricolage';
! 	$opt_w = catdir($ENV{BRICOLAGE_ROOT}, 'sql', DBD);
      }
  
      # Print a usage message unless all required args are included or if -h has
--- 188,197 ----
  
      if ($opt_w) {
          # Add on the location of the SQL.
!         $opt_w = catdir($opt_w);
      } else {
! 	$ENV{BRICOLAGE_ROOT} ||= '/usr/local/share/bricolage';
! 	$opt_w = catdir($ENV{BRICOLAGE_ROOT});
      }
  
      # Print a usage message unless all required args are included or if -h has