projects
/
fgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always display new group
[fgen.git]
/
fgen.sh
diff --git
a/fgen.sh
b/fgen.sh
index
7dc2bb2
..
2f1fb5b
100755
(executable)
--- a/
fgen.sh
+++ b/
fgen.sh
@@
-37,12
+37,28
@@
case ${OSTYPE} in
;;
esac
;;
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_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()
{
# Arg1: layer
function get_size()
{
@@
-221,7
+237,7
@@
if [ $# -gt 1 ]; then
fi
if [ ! -f "${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
exit 1
fi
@@
-254,7
+270,7
@@
if [ ${trames} -eq 1 ]; then
log_dbg "Background size: ${size}"
if [ x"${size}" = x"" ]; 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
exit 1
fi
@@
-298,7
+314,7
@@
if [ ${trames} -eq 1 ]; then
fi
group="${ng}"
fi
group="${ng}"
- log_
dbg
"New group: ${ng}"
+ log_
info
"New group: ${ng}"
nf=""
oldnf=""
nf=""
oldnf=""
@@
-322,9
+338,9
@@
if [ ${trames} -eq 1 ]; then
expected_nf=$((${oldnf} + 1))
if [ ${expected_nf} -ne ${nf} ]; 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
insert_empty_frames ${expected_nf} $((${nf} -1))
fi
fi
@@
-353,6
+369,8
@@
if [ ${trames} -eq 1 ]; then
# Use symlink???
cp ${fname} ${wfname}
# Use symlink???
cp ${fname} ${wfname}
+
+ nf=${w}
done
fi
done
fi