Various bug fixes and improvements.

[videoscripts/.git] / merge_videos_by_day

diff --git a/merge_videos_by_day b/merge_videos_by_day
index b012c392bb40d090d0c9be872d0e28f140b4ce26..cd980405fd0abff79574b1f4c67da4133bda5418 100755 (executable)
--- 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;
@@ -174,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\"");