Simplify PNG files detection

[fgen.git] / fgen.sh

diff --git a/fgen.sh b/fgen.sh
index f303f1a..b1bd4e2 100755 (executable)
--- a/fgen.sh
+++ b/fgen.sh
@@ -136,7 +136,7 @@ function get_frame_name()
     local index
 
     index=$(printf "${F_FMT}" ${1})
-    echo "${dest}/${group}-f${index}.png"
+    echo "${dest}/${dest}-${group}-f${index}.png"
 }
 
 # Arg1: start frame
@@ -165,16 +165,14 @@ function generate_video()
     local png_files
 
     if which ffmpeg 1> /dev/null 2>&1; then
-        set +e
-        png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
-        set -e
+        png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null || echo "")
 
         if [ x"${png_files}" != x"" ]; then
             log_dbg "generate_video start"
 
             local outfile
 
-            outfile=${dest}/${group}.mp4
+            outfile=${dest}/${dest}-${group}.mp4
 
             if [ ${dry_run} -eq 1 ]; then
                 touch ${outfile}