X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=merge_videos_by_day;h=cd980405fd0abff79574b1f4c67da4133bda5418;hb=ff98ac971a1fd73de86500e8fffe633138098aa1;hp=52164d4689824615a25c3a206f81528c926e8347;hpb=75913896fe5842b5783d61a8a0c9b709940faf5d;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index 52164d4..cd98040 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -121,7 +121,7 @@ foreach $file (sort `$find_cmd`) {
     $newfile = $dstfile . "." . $video_suffix;
     if(-e "$newfile.$ext") {
 	foreach $i ($video_suffix+1 .. '999') {
-	    $newfile = $dstfile . "." . $i;
+	    $newfile = $dstfile . "." . sprintf("%03d",$i);
 	    if(! -e "$newfile.$ext") { last; }
 	}
 	$dstfile = $newfile;
@@ -141,6 +141,7 @@ foreach $video (sort keys %videos) {
 	print "   merging \"$srcfile\" into \"$video\"\n";
     }
 }
+print "\n";
 
 # Now actually do the merging
 foreach $video (sort keys %videos) {
@@ -173,7 +174,7 @@ foreach $video (sort keys %videos) {
     } else {
 	# Create the merged video
 	my $errno = system("$cmd");
-	if($errno > 0) { $errno = $errno - 255; }
+	$errno = $errno >> 8;
 	if($errno) { die "-E- make_mkv encountered some errors with exit code $errno\n"; }
 	# Fix the permissions
 	system("chown $owner \"$video\"");