Some more fixes to the release scripts

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-31

diff --git a/maint/release b/maint/release
index 073836d5e7457e276b967d5b65e79adfd4c9b98b..f33ef745c3c8d45dcb8fade1b01e13bf2613c2e2 100755 (executable)
--- a/maint/release
+++ b/maint/release
@@ -33,6 +33,6 @@ $r->GenFile("pciutils.lsm");
 $r->Dispatch;
 if ($r->{"do_upload"}) {
        print "Uploading pci.ids to Jabberwock\n";
-       `scp pci.ids pciids\@jabberwock.ucw.cz:05-pciutils.new`; die if $?;
+       `scp -C pci.ids pciids\@jabberwock.ucw.cz:05-pciutils.new`; die if $?;
        `ssh pciids\@jabberwock.ucw.cz mv 05-pciutils.new origs/05-pciutils`; die if $?;
 }

diff --git a/maint/release.pm b/maint/release.pm
index a3c88ec389d8ba7ffe23862a3d826f5d4e3ff2ea..73d2494919170d0af6109c264fbfecd19794d7f9 100644 (file)
--- a/maint/release.pm
+++ b/maint/release.pm
@@ -275,7 +275,11 @@ sub Upload($) {
                print "<confirm> "; <STDIN>;
                if ($url =~ m@^scp://([^/]+)(.*)@) {
                        $, = " ";
-                       my $cmd = "scp @files $1:$2\n";
+                       my $host = $1;
+                       my $dir = $2;
+                       $dir =~ s@^/~@~@;
+                       $dir =~ s@^/\./@@;
+                       my $cmd = "scp @files $host:$dir\n";
                        `$cmd`; die if $?;
                } elsif ($url =~ m@ftp://([^/]+)(.*)@) {
                        my $host = $1;