OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 05-Apr-2004 21:30:08
Branch: HEAD Handle: 2004040520300800
Modified files:
openpkg-tools/cmd build.pl index.pl
Log:
adjust for new environment
Summary:
Revision Changes Path
1.2 +5 -6 openpkg-tools/cmd/build.pl
1.2 +3 -5 openpkg-tools/cmd/index.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/build.pl
============================================================================
$ cvs diff -u -r1.1 -r1.2 build.pl
--- openpkg-tools/cmd/build.pl 5 Apr 2004 18:07:06 -0000 1.1
+++ openpkg-tools/cmd/build.pl 5 Apr 2004 19:30:08 -0000 1.2
@@ -24,6 +24,8 @@
##
require 5;
+use OpenPKG::Ctx;
+my $ctx = new OpenPKG::Ctx;
$|=1; # autoflush
@@ -155,9 +157,10 @@
my($RPM,$CURL,$PROG);
+my $l_prefix = $ctx->prefix();
$RPM = $opt_R || $env{''}->{'R'} ||
- ((-f "@l_prefix@/bin/openpkg" && -f "@l_prefix@/libexec/openpkg/rpm") ?
- "@l_prefix@/bin/openpkg rpm" : "@l_prefix@/bin/rpm");
+ ((-f "$l_prefix/bin/openpkg" && -f "$l_prefix/libexec/openpkg/rpm") ?
+ "$l_prefix/bin/openpkg rpm" : "$l_prefix/bin/rpm");
$RPM = (`which $RPM` =~ m{^(/.*)})[0] if ($RPM !~ m|^/|);
die "FATAL: cannot locate rpm in path\n" unless $RPM =~ m{^/};
@@ -2470,10 +2473,6 @@
=head1 NAME
B<openpkg build> - B<OpenPKG> Maintenance Tool (Building)
-
-=head1 VERSION
-
-openpkg build XX-VERSION-XX
=head1 SYNOPSIS
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/index.pl
============================================================================
$ cvs diff -u -r1.1 -r1.2 index.pl
--- openpkg-tools/cmd/index.pl 5 Apr 2004 18:07:06 -0000 1.1
+++ openpkg-tools/cmd/index.pl 5 Apr 2004 19:30:08 -0000 1.2
@@ -28,13 +28,15 @@
use strict;
use Getopt::Std;
+use OpenPKG::Ctx;
getopts('r:p:C:o:ci');
use vars qw/$opt_r $opt_p $opt_C $opt_o $opt_c $opt_i/;
use FileHandle;
use DirHandle;
-my $l_prefix = '@l_prefix@';
+my $ctx = new OpenPKG::Ctx;
+my $l_prefix = $ctx->prefix();
my $RPM = ((-f "$l_prefix/bin/openpkg" && -f "$l_prefix/libexec/rpm") ?
"$l_prefix/bin/openpkg rpm" : "$l_prefix/bin/rpm");
my $R2C = ((-f "$l_prefix/bin/openpkg" && -f "$l_prefix/libexec/rpm2cpio") ?
@@ -1003,10 +1005,6 @@
=head1 NAME
B<openpkg index> - B<OpenPKG> Maintenance Tool (Indexing)
-
-=head1 VERSION
-
-openpkg index XX-VERSION-XX
=head1 SYNOPSIS
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
