Use subdirectories.

[nethome.git] / bin / rpmmerge

diff --git a/bin/rpmmerge b/bin/rpmmerge
index 38eb885..c61a6b7 100755 (executable)
--- a/bin/rpmmerge
+++ b/bin/rpmmerge
@@ -14,10 +14,10 @@ for base in $l;do
        test ! -f $base.rej
 
        test ! -f $base-orig
-       # The old format should be converted by:
+       # The old `-orig' format should be converted by:
        # rpm -qla|perl -lne 'chomp;s/$/-orig/;next if ! -e;$o=$_;$o=~s/-orig$//;$o=~tr{/}{-};$o="/root/rpmmerge/$o";die $o if -e $o;$_="mv -f '\''$_'\'' '\''$o'\''";system $_ and die "$_: $!";'
 
-       orig="/root/rpmmerge/$(echo $base|tr / -)"
+       orig="/root/rpmmerge/$base"
 
        if test ! -f $orig
        then
@@ -53,7 +53,8 @@ done
 
 if $ok
 then
-       rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if ! -f $_;$o=$_;$o=~tr{/}{-};$o="/root/rpmmerge/$o";next if -e $o;system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
+       mkdir -p /root/rpmmerge
+       rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if ! -f $_;$o=$_;$o="/root/rpmmerge/$o";next if -e $o;$od=$o;$od=~s{[^/]*$}{};system "mkdir -p '\''$od'\''" and die "dir $_: $!";system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
 
        echo OK
 else