Changeset 29371
- Timestamp:
- 2014-10-16T11:25:27+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/build
r24362 r29371 60 60 use parsargv; 61 61 use util; 62 use FileUtils; 62 63 use cfgread; 63 64 use colcfg; … … 72 73 my $path_separator = ":"; 73 74 $path_separator = ";" if $ENV{'GSDLOS'} =~ /^windows$/; 74 $ENV{'PATH'} = & util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}) .75 $path_separator . & util::filename_cat($ENV{'GSDLHOME'}, "bin", "script") .75 $ENV{'PATH'} = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}) . 76 $path_separator . &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", "script") . 76 77 $path_separator . $ENV{'PATH'}; 77 78 … … 111 112 { 112 113 die "GSDL3HOME not set." unless $ENV{'GSDL3HOME'}; 113 $cdir = & util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect") unless $collectdir =~ /\w/;114 $cdir = &FileUtils::filenameConcatenate ($ENV{'GSDL3HOME'}, "sites", $site, "collect") unless $collectdir =~ /\w/; 114 115 $gs_mode = "gs3"; 115 116 } 116 117 else 117 118 { 118 $cdir = & util::filename_cat($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/;119 $cdir = &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/; 119 120 $gs_mode = "gs2"; 120 121 } 121 122 122 my $importdir = & util::filename_cat($cdir, $collection, "import");123 my $archivedir = & util::filename_cat($cdir, $collection, "archives");124 my $buildingdir = & util::filename_cat($cdir, $collection, "building");125 my $indexdir = & util::filename_cat($cdir, $collection, "index");126 my $etcdir = & util::filename_cat($cdir, $collection, "etc");127 my $bindir = & util::filename_cat($ENV{'GSDLHOME'}, "bin");123 my $importdir = &FileUtils::filenameConcatenate ($cdir, $collection, "import"); 124 my $archivedir = &FileUtils::filenameConcatenate ($cdir, $collection, "archives"); 125 my $buildingdir = &FileUtils::filenameConcatenate ($cdir, $collection, "building"); 126 my $indexdir = &FileUtils::filenameConcatenate ($cdir, $collection, "index"); 127 my $etcdir = &FileUtils::filenameConcatenate ($cdir, $collection, "etc"); 128 my $bindir = &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "bin"); 128 129 129 130 my $use_out = 0; … … 134 135 135 136 # delete any existing .final file 136 & util::rm("$outfile.final") if -e "$outfile.final";137 &FileUtils::removeFiles ("$outfile.final") if -e "$outfile.final"; 137 138 138 139 $use_out = 1; … … 141 142 142 143 # delete any .kill file left laying around from a previously aborted build 143 if (-e & util::filename_cat($cdir, $collection, ".kill")) {144 & util::rm (&util::filename_cat($cdir, $collection, ".kill"));144 if (-e &FileUtils::filenameConcatenate ($cdir, $collection, ".kill")) { 145 &FileUtils::removeFiles (&FileUtils::filenameConcatenate ($cdir, $collection, ".kill")); 145 146 } 146 147 147 148 # get maintainer email address from main.cfg 148 149 my $maintainer = "NULL"; 149 my $main_cfg = & util::filename_cat($ENV{'GSDLHOME'}, "etc", "main.cfg");150 my $main_cfg = &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "etc", "main.cfg"); 150 151 my $cfgdata = &cfgread::read_cfg_file ($main_cfg, "maintainer"); 151 152 if (defined $cfgdata->{'maintainer'} && $cfgdata->{'maintainer'} =~ /\w/) { … … 166 167 my ($final_etcdir); 167 168 if ($dontinstall) { 168 $final_etcdir = & util::filename_cat($collectdir, "etc", "build.log");169 $final_etcdir = &FileUtils::filenameConcatenate($collectdir, "etc", "build.log"); 169 170 } else { 170 $final_etcdir = & util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log");171 $final_etcdir = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log"); 171 172 } 172 173 173 & util::cp($outfile, $final_etcdir);174 &FileUtils::copyFiles($outfile, $final_etcdir); 174 175 } 175 176 … … 204 205 print STDOUT " a -download option is supplied\n"; 205 206 print STDOUT " -collectdir directory Collection directory (defaults to " . 206 & util::filename_cat($ENV{'GSDLHOME'}). "collect for Greenstone2;\n";207 &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}). "collect for Greenstone2;\n"; 207 208 print STDOUT" for Greenstone3 use -site option and then collectdir default will be\n"; 208 209 print STDOUT " set to the collect folder within that site.)\n"; … … 225 226 print STDOUT " etc.) to event_log_file\n"; 226 227 print STDOUT " -event_log_file file File to append important events to (defaults to\n"; 227 print STDOUT " " . & util::filename_cat($ENV{'GSDLHOME'}, "etc", "events.txt") . "\n";228 print STDOUT " " . &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "etc", "events.txt") . "\n"; 228 229 print STDOUT " -email_events addr Comma separated list of email addresses to mail\n"; 229 230 print STDOUT " details of important collection building events\n"; … … 242 243 if ($save_archives && -d $archivedir) { 243 244 print $out "caching original archives to ${archivedir}.org\n"; 244 & util::cp_r($archivedir, "${archivedir}.org");245 &FileUtils::copyFilesRecursive ($archivedir, "${archivedir}.org"); 245 246 } 246 247 … … 250 251 if (&has_content ($importdir)) { 251 252 #print $out "build: WARNING: removing contents of $importdir\n"; 252 #& util::rm_r($importdir);253 #&FileUtils::removeFilesRecursive ($importdir); 253 254 } 254 255 … … 294 295 next if $file =~ /^\.\.?$/; 295 296 if ($file =~ /^robots.txt$/i) { 296 & util::rm (&util::filename_cat($importdir, $file));297 &FileUtils::removeFiles (&FileUtils::filenameConcatenate ($importdir, $file)); 297 298 last; 298 299 } else { 299 $file = & util::filename_cat($importdir, $file);300 $file = &FileUtils::filenameConcatenate ($importdir, $file); 300 301 if (-d $file) { 301 302 if (opendir (DIR, $file)) { … … 304 305 foreach my $file2 (@files2) { 305 306 if ($file2 =~ /^robots.txt$/i) { 306 & util::rm (&util::filename_cat($file, $file2));307 &FileUtils::removeFiles (&FileUtils::filenameConcatenate ($file, $file2)); 307 308 last; 308 309 } … … 352 353 my $col_cfg_file; 353 354 if ($gs_mode eq "gs3") { 354 $col_cfg_file = & util::filename_cat($etcdir, "collectionConfig.xml");355 $col_cfg_file = &FileUtils::filenameConcatenate($etcdir, "collectionConfig.xml"); 355 356 } else { 356 $col_cfg_file = & util::filename_cat($etcdir, "collect.cfg");357 $col_cfg_file = &FileUtils::filenameConcatenate($etcdir, "collect.cfg"); 357 358 } 358 359 … … 415 416 if ((defined $site) && ($site ne "")) 416 417 { 417 $install_collectdir = & util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect");418 $install_collectdir = &FileUtils::filenameConcatenate ($ENV{'GSDL3HOME'}, "sites", $site, "collect"); 418 419 } 419 420 else … … 428 429 else 429 430 { 430 $install_collectdir = & util::filename_cat($ENV{'GSDLHOME'}, "collect");431 $install_collectdir = &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "collect"); 431 432 } 432 433 … … 435 436 # install collection to gsdl/collect 436 437 print $out "installing the $collection collection\n"; 437 my $newdir = & util::filename_cat($install_collectdir, $collection);438 my $olddir = & util::filename_cat($collectdir, $collection);438 my $newdir = &FileUtils::filenameConcatenate ($install_collectdir, $collection); 439 my $olddir = &FileUtils::filenameConcatenate ($collectdir, $collection); 439 440 if (-d $newdir) { 440 441 my $msg = "build: Could not install collection as $newdir\n" . … … 494 495 if ($remove_import) { 495 496 print $out "removing import directory ($importdir)\n"; 496 & util::rm_r($importdir);497 &FileUtils::removeFilesRecursive ($importdir); 497 498 } 498 499 } else { … … 540 541 my $build_ok = 0; 541 542 foreach my $db_ext (@db_exts) { 542 if ($removeold && (-e & util::filename_cat($buildingdir, "text", "$collection$db_ext"))) {543 if ($removeold && (-e &FileUtils::filenameConcatenate ($buildingdir, "text", "$collection$db_ext"))) { 543 544 $build_ok = 1; 544 545 last; 545 546 } 546 if (($removeold==0) && (-e & util::filename_cat($indexdir, "text", "$collection$db_ext"))) {547 if (($removeold==0) && (-e &FileUtils::filenameConcatenate ($indexdir, "text", "$collection$db_ext"))) { 547 548 $build_ok = 1; 548 549 last; … … 554 555 if ($remove_archives) { 555 556 print $out "removing archives directory ($archivedir)\n"; 556 & util::rm_r($archivedir);557 &FileUtils::removeFilesRecursive ($archivedir); 557 558 } 558 559 } else { … … 568 569 if (&has_content ($indexdir)) { 569 570 print $out "removing old indexes\n"; 570 & util::rm_r($indexdir);571 &FileUtils::removeFilesRecursive ($indexdir); 571 572 } 572 573 rmdir ($indexdir) if -d $indexdir; … … 579 580 # remove the cached archives 580 581 if ($save_archives && -d "${archivedir}.org") { 581 & util::rm_r("${archivedir}.org");582 &FileUtils::removeFilesRecursive ("${archivedir}.org"); 582 583 } 583 584 } … … 611 612 $/ = "\n"; 612 613 close FILE; 613 & util::rm($file);614 &FileUtils::removeFiles ($file); 614 615 } 615 616 … … 652 653 if ($event_log_file eq "" || !open (LOG, ">>$event_log_file")) { 653 654 # log file defaults to $GSDLHOME/etc/events.txt 654 $event_log_file = & util::filename_cat($ENV{'GSDLHOME'}, "etc", "events.txt");655 $event_log_file = &FileUtils::filenameConcatenate ($ENV{'GSDLHOME'}, "etc", "events.txt"); 655 656 if (!open (LOG, ">>$event_log_file")) { 656 657 print $out "build: ERROR: Couldn't open event log file $event_log_file\n"; … … 724 725 if ($make_writable) { 725 726 # chmod a+rw new collection 726 my $installed_collection = & util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection);727 my $installed_collection = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect", $collection); 727 728 &recursive_chmod($installed_collection); 728 729 729 730 # chmod a+rw anything we've left laying about in the tmp directory 730 731 if (($collectdir ne "") && 731 (!&util::filenames_equal ($collectdir, & util::filename_cat($ENV{'GSDLHOME'}, "collect")))) {732 (!&util::filenames_equal ($collectdir, &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect")))) { 732 733 &recursive_chmod($collectdir); 733 734 } … … 751 752 foreach my $file (@files) { 752 753 next if $file =~ /^\.\.?$/; 753 $file = & util::filename_cat($dir, $file);754 $file = &FileUtils::filenameConcatenate($dir, $file); 754 755 if (-d $file) { 755 756 &recursive_chmod ($file);
Note:
See TracChangeset
for help on using the changeset viewer.