mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

more bugfixes

Browse Source
This commit is contained in:
joey
2000-04-22 01:47:39 +00:00
parent 07a81c8b5c
commit d50d1982d5
5 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Alien/Package/Deb.pm
View File

@@ -285,7 +285,7 @@ sub prep {
print OUT "Depends: \${shlibs:Depends}\n";
print OUT "Description: ".$this->summary."\n";
print OUT $this->description."\n";
print OUT ".\n";
print OUT " .\n";
print OUT " (Converted from a .".$this->origformat." package by alien.)\n";
close OUT;
@@ -378,7 +378,7 @@ sub build {
my $this=shift;
chdir $this->unpacked_tree;
system("debian/rules binary") && die "package build failed: $!";
system("debian/rules binary >/dev/null") && die "package build failed: $!";
chdir "..";
return $this->name."_".$this->version."-".$this->release."_".$this->arch.".deb";

15
Alien/Package/Rpm.pm
View File

@@ -138,7 +138,7 @@ sub unpack {
my $workdir=$this->unpacked_tree;
system ("rpm2cpio ".$this->filename." | (cd $workdir; cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>/dev/null") &&
die "Unpacking of `".$this->filename."' failed: $!";
die "Unpacking of `".$this->filename."' failed";
# If the package is relocatable. We'd like to move it to be under
# the $this->prefixes directory. However, it's possible that that
@@ -215,8 +215,7 @@ sub prep {
my $filelist;
foreach my $fn (@{$this->filelist}) {
if ($fn =~ m:/$:) {
# a directory.
$filelist.="%dir \"$fn\"\n";
# a directory. Skip entirely.
}
elsif (grep(m:^\Q$fn\E$:,@conffiles)) { # it's a conffile
$filelist.="%config $fn\n";
@@ -323,7 +322,7 @@ sub build {
$opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS};
system("cd $dir; rpm $opts -bb ".$this->name."-".$this->version."-".$this->release.".spec >/dev/null") &&
die "package build failed: $!";
die "package build failed";
return $rpm;
}
@@ -391,19 +390,19 @@ sub _script_helper {
}
sub postinst {
my $this=shift;
$this->_script_helper($this, 'postinst', @_);
$this->_script_helper('postinst', @_);
}
sub postrm {
my $this=shift;
$this->_script_helper($this, 'postrm', @_);
$this->_script_helper('postrm', @_);
}
sub preinst {
my $this=shift;
$this->_script_helper($this, 'preinst', @_);
$this->_script_helper('preinst', @_);
}
sub prerm {
my $this=shift;
$this->_script_helper($this, 'prerm', @_);
$this->_script_helper('prerm', @_);
}
=item arch

10
Alien/Package/Slp.pm
View File

@@ -164,15 +164,19 @@ sub scan {
my @filelist;
# FIXME: support gzip files too!
foreach (`bzip2 -d < $file | tar -tf -`) {
chomp;
s:^\./:/:;
$_="/$_" unless m:^/:;
push @filelist, $_;
}
$this->filelist(\@filelist);
# TODO: read in postinst script.
$this->distribution('Stampede');
$this->origformat('slp');
$this->changelogtext('');
$this->binary_info(`ls -l $file`);
return 1;
}
@@ -191,12 +195,10 @@ sub unpack {
my $compresstype=$this->compresstype;
if ($compresstype == 0) {
system("bzip2 -d $file | (cd ".$this->unpacked_tree."; tar xpf -") &&
die "unpack failed";
system("bzip2 -d < $file | (cd ".$this->unpacked_tree."; tar xpf -)")
}
elsif ($compresstype == 1) {
system("cat $file | (cd ".$this->unpacked_tree."; tar zxpf -") &&
die "unpack failed";
system("cat $file | (cd ".$this->unpacked_tree."; tar zxpf -)")
}
else {
die "package uses an unknown compression type, $compresstype (please file a bug report)";

2
Alien/Package/Tgz.pm
View File

@@ -114,6 +114,8 @@ sub scan {
$this->release(1);
$this->distribution("Slackware");
$this->origformat('tgz');
$this->changelogtext('');
$this->binary_info(`ls -l $file`);
# Now figure out the conffiles. Assume anything in etc/ is a
# conffile.