X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fvidwhacker;h=9646f6bd95dd67ca61fdf9acc4897f0854dbddcb;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=6cd24f306c736fc5518c539496c5c7e9734761bd;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver

diff --git a/hacks/vidwhacker b/hacks/vidwhacker
index 6cd24f30..9646f6bd 100755
--- a/hacks/vidwhacker
+++ b/hacks/vidwhacker
@@ -21,7 +21,7 @@ use diagnostics;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.30 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my ($version) = ('$Revision: 1.33 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 0;
 my $use_stdin = 0;
@@ -326,6 +326,7 @@ sub get_ppm() {
       my $fn = `$cmd`;
       $fn =~ s/\n$//s;
       error ("didn't get a file?") if ($fn eq "");
+      $fn = "$imagedir/$fn" unless ($fn =~ m@^/@s);
 
       print STDERR "$progname: selected file $fn\n" if ($verbose > 1);
 
@@ -439,7 +440,7 @@ sub error($) {
 
 sub usage() {
   print STDERR "VidWhacker, Copyright (c) 2001 Jamie Zawinski <jwz\@jwz.org>\n";
-  print STDERR "            http://www.jwz.org/xscreensaver/";
+  print STDERR "            https://www.jwz.org/xscreensaver/";
   print STDERR "\n";
   print STDERR "usage: $0 [-display dpy] [-verbose]\n";
   print STDERR "\t\t[-root | -window | -window-id 0xXXXXX ]\n";
@@ -451,7 +452,7 @@ sub usage() {
 sub main() {
   while ($_ = $ARGV[0]) {
     shift @ARGV;
-    if ($_ eq "--verbose") { $verbose++; }
+    if (m/^--?verbose$/) { $verbose++; }
     elsif (m/^-v+$/) { $verbose += length($_)-1; }
     elsif (m/^(-display|-disp|-dis|-dpy|-d)$/) { $ENV{DISPLAY} = shift @ARGV; }
     elsif (m/^--?stdin$/) { $use_stdin = 1; }