diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 224f763..f43ed52 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -419,7 +419,7 @@ sub _script_helper { # set if (@_) { my $value=shift; - if (length $value and $value !~ m/#!\s*\//) { + if (length $value and $value !~ m/^#!\s*\//) { $value="#!/bin/sh\n$value"; } $this->{$script} = $value; @@ -431,7 +431,7 @@ sub _script_helper { $_=$this->{$script}; return '' unless defined $_; return $_ if m/^\s*$/; - return $_ if m/#!\s*\/bin\/sh/; # looks like a shell script already + return $_ if m/^#!\s*\/bin\/sh/; # looks like a shell script already my $f = pack("u",$_); $f =~ s/%/%%/g; # Rpm expands %S, so escape such things. return "#!/bin/sh\n". diff --git a/debian/changelog b/debian/changelog index ba23401..cdbaf23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +alien (8.01) unstable; urgency=low + + * The "vmware and dpkg on drugs" release. + * If a preinstall script in a rpm starts like this: + # BEGINNING_OF_POST_DOT_SH + #!/bin/sh + Add anther hashbang at the top, so dpkg doesn't croak on it. + Closes: #137032 + + -- Joey Hess Wed, 6 Mar 2002 12:57:06 -0500 + alien (8.00) unstable; urgency=low * LSB package support. It can generate LSB packages (not guarenteed