X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=07507d74a14d6ff3f3e1162ee394b38110892a28;hb=b7c8901b98e3e1f0c13fbd35cac3980daa367678;hp=4fe0634111e6615d749da9297bf77c5ff125d9bd;hpb=e2483c8b18aa2cf29edf5b4e70f26d3c367a41a1;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 4fe0634..07507d7 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -36,7 +36,7 @@ function log_dbg() {
 # Arg1: layer
 function get_size()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
+    cat ${layers} | grep -m 1 "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
 }
 
 # Arg1: layer
@@ -62,7 +62,7 @@ function get_label()
 # Arg1: line
 function get_frame_id()
 {
-    frame=$(echo "${1}" | grep -e "label:[0-9]" | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
+    frame=$(echo "${1}" | grep -e "label:[0-9]\+," | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
 
     if [ x"${frame}" = x"" ]; then
         echo ""
@@ -145,7 +145,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do