[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

[legatvs]

The following commit has been merged in the master branch:
commit a34bb773e94e83ceb143fdadceba5f833a30f6ab
Author: legatvs <legatvs at gmail.com>
Date:   Fri Mar 13 18:43:18 2009 +0200

    Fix --exec (symptom: not found errors). Add config [commands]:exec.

diff --git a/CHANGES b/CHANGES
index f921e0c..5d58afd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Version 2.1.7
 
  User-visible changes:
+  * Fix --exec
+    Symptom: not found errors
+  * Add support for config file [commands] exec (see configrc for an example)
   * Add --stream-exec and --stream options
     - Ported from cclive
   * Change default filename format to %t_%d_%i.%s
diff --git a/clive b/clive
index 14730ab..5fc96e5 100755
--- a/clive
+++ b/clive
@@ -102,8 +102,9 @@ my $c = Config::Tiny->read($CONFIGFILE);
     showfmt     => $c->{output}->{show},
     ytuser      => $c->{youtube}->{user},
     ytpass      => $c->{youtube}->{pass},
-    clivepass   => $c->{commands}->{clivepass},
+    exec        => $c->{commands}->{exec},
     streamexec  => $c->{commands}->{stream},
+    clivepass   => $c->{commands}->{clivepass},
 );
 
 $opts{clivepass}    = $ENV{CLIVEPASS_PATH} unless $opts{clivepass};
@@ -1482,14 +1483,14 @@ sub exec_cmd {
     return if !$opts{exec};
     if ($opts{exec} =~ /;$/) { # semi
         foreach (@exec_files) {
-            my $cmd = sprintf('"%s" ',$opts{exec});
+            my $cmd = $opts{exec};
             $cmd =~ s/%i/"$_"/g;
             $cmd =~ tr{;}//d;
             system("$cmd");
         }
     } else { # plus
         my $cmd = sprintf("%s ",$opts{exec});
-        $cmd =~ tr{%i}//d;
+        $cmd =~ s/%i//g;
         $cmd =~ tr{+}//d;
         $cmd .= sprintf('"%s" ',$_)
             foreach (@exec_files);
diff --git a/configrc b/configrc
index 01b518e..2c4a5bd 100644
--- a/configrc
+++ b/configrc
@@ -52,7 +52,7 @@
 
 [commands]
     ## Command to be executed subsequently after each file transfer (--exec).
-    #exec = /usr/local/bin/ffmpeg -y -i %i %i.mp3
+    #exec = /usr/local/bin/ffmpeg -y -i %i %i.mp3;
 
     ## Stream command to be executed (--stream-exec).
     #stream = /usr/local/bin/mplayer -really-quiet %i

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)