X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=8a700c7e621a063d9915dbaef7a861ee722075e1;hb=826c3d6c2e7f42dfe8dcea624fb1c33cda7b1d8e;hp=7dc2bb24ddd8cceaa274f6efee54071f47f29288;hpb=e00c72a094bd8ef422be8d6e6c89b9b3f656246a;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 7dc2bb2..8a700c7 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -37,12 +37,28 @@ case ${OSTYPE} in
         ;;
 esac
 
+COLOR_ERR="\033[0;31m"
+COLOR_WARN="\033[0;33m"
+COLOR_NONE="\033[0m"
+
+function log_info() {
+    echo -e "${COLOR_NONE}${*}"
+}
+
 function log_dbg() {
     if [ x"${debug}" = x"1" ]; then
         echo "${*}"
     fi
 }
 
+function log_warn() {
+    echo -e "${COLOR_WARN}${*}${COLOR_NONE}"
+}
+
+function log_err() {
+    echo -e "${COLOR_ERR}${*}${COLOR_NONE}"
+}
+
 # Arg1: layer
 function get_size()
 {
@@ -221,7 +237,7 @@ if [ $# -gt 1 ]; then
 fi
 
 if [ ! -f "${1}" ]; then
-    echo "Error: PSD source file not found"
+    log_err "Error: PSD source file not found"
     exit 1
 fi
 
@@ -254,7 +270,7 @@ if [ ${trames} -eq 1 ]; then
     log_dbg "Background size: ${size}"
 
     if [ x"${size}" = x"" ]; then
-        echo "Error: background layer not found"
+        log_err "Error: background layer not found"
         exit 1
     fi
 
@@ -298,7 +314,7 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             group="${ng}"
-            log_dbg "New group: ${ng}"
+            log_info "New group: ${ng}"
 
             nf=""
             oldnf=""
@@ -322,9 +338,9 @@ if [ ${trames} -eq 1 ]; then
                 expected_nf=$((${oldnf} + 1))
 
                 if [ ${expected_nf} -ne ${nf} ]; then
-                    echo "Warning: non-sequential frame sequence: ${nf}"
-                    echo "  previous: ${oldnf}"
-                    echo "  expected: ${expected_nf}"
+                    log_warn "Warning: non-sequential frame sequence: ${nf}"
+                    log_warn "  previous: ${oldnf}"
+                    log_warn "  expected: ${expected_nf}"
                     insert_empty_frames ${expected_nf} $((${nf} -1))
                 fi
             fi
@@ -338,7 +354,7 @@ if [ ${trames} -eq 1 ]; then
             else
                 convert -colorspace sRGB -page +0+0 ${dest}/background.png \
                         ${files} -background none -layers merge \
-                        ${fname}
+                        PNG32:${fname}
             fi
 
             if [ x"${dup_from}" != x"" ]; then
@@ -353,6 +369,8 @@ if [ ${trames} -eq 1 ]; then
 
                     # Use symlink???
                     cp ${fname} ${wfname}
+
+                    nf=${w}
                 done
             fi