[Bio] / FigCommon / bootstrap.pl Repository:
ViewVC logotype

Diff of /FigCommon/bootstrap.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3, Tue Dec 23 17:56:32 2003 UTC revision 1.6, Sun Jan 11 20:09:10 2004 UTC
# Line 135  Line 135 
135      chomp $hostname;      chomp $hostname;
136    
137      push(@$Config, ["fig_disk", $fig_disk, 1]);      push(@$Config, ["fig_disk", $fig_disk, 1]);
138      push(@$Config, ["blastmast", "$fig_disk/BLASTMAT", 1]);      push(@$Config, ["blastmat", "$fig_disk/BLASTMAT", 1]);
139      push(@$Config, ["fig", $fig, 1]);      push(@$Config, ["fig", $fig, 1]);
140      push(@$Config, ["bin", $fig_bin, 1]);      push(@$Config, ["bin", $fig_bin, 1]);
141      push(@$Config, ["ext_bin", $env_bin, 1]);      push(@$Config, ["ext_bin", $env_bin, 1]);
# Line 213  Line 213 
213    
214  sub find_in_path  sub find_in_path
215  {  {
216      my($file) = @_;      my($file, @extra) = @_;
217      my(@path) = split(":", $ENV{PATH});      my(@path) = split(":", $ENV{PATH});
218    
219      for my $p (@path)      for my $p (@path, @extra)
220      {      {
221          my $x = "$p/$file";          my $x = "$p/$file";
222          if (-x $x)          if (-x $x)
# Line 251  Line 251 
251          # /usr/local/bin/pythonw by default.          # /usr/local/bin/pythonw by default.
252          #          #
253    
254            #
255            # Sigh. This requires #!/usr/bin/env to work properly
256            #
257            $OtherConfig->{python_require_poundbang_env} = 1;
258          return "/usr/local/bin/pythonw";          return "/usr/local/bin/pythonw";
259      }      }
260      else      else
# Line 515  Line 519 
519    
520      my $python = find_python();      my $python = find_python();
521    
522        if ($OtherConfig->{python_require_poundbang_env})
523        {
524            print $fh "#!/usr/bin/env $python\n";
525        }
526        else
527        {
528      print $fh "#!$python\n";      print $fh "#!$python\n";
529        }
530      print $fh "\n";      print $fh "\n";
531    
532      print $fh "import sys\n";      print $fh "import sys\n";

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.6

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3