X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=helpers%2Fgenall.sh;h=78e079432be0752de965b5f21391964b50744883;hb=b3b0d44a61029470e449827a1fa4b686e4279b7c;hp=6aab046c6daedd615e6beb934ce441ddf5e2fbf1;hpb=c7e6e63b567cd68f0a9c1f12dd92b175d2f6a2a0;p=serve0

diff --git a/helpers/genall.sh b/helpers/genall.sh
index 6aab046..78e0794 100755
--- a/helpers/genall.sh
+++ b/helpers/genall.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 dir="$(dirname $0)"
 genmeta="$dir/genmeta.sh"
@@ -7,7 +23,6 @@ genthumb="$dir/genthumb.sh"
 
 addtag(){
   meta="$1"
-  info="$(basename "$1" |sed -r 's:^(.+)\.meta$:\1:')"
   tag="$2"
   
   length=0; width=0; height=0;
@@ -19,7 +34,7 @@ addtag(){
   
   egrep -q "(^|.*\|)$tag(\|.*|$)" <<<"$tags" || tags="$tag|$tags"
   
-  cat <<EOF >"$meta"
+  cat >"$meta" <<EOF
 $length	$width	$height	$info
 $tags
 $description
@@ -29,13 +44,13 @@ EOF
 
 for each in *; do
 if (egrep -q "$file_pattern" <<<"$each"); then
-  echo -n "$each ... Thumb ..."
-  $genthumb "$each" "${each}.jpg"
-  echo -n ' Meta ...'
-  $genmeta "$each" "${each}.meta"
-  echo -n ' Tags ...'
+  printf %s "$each ... Thumb ..."
+  $genthumb "$each" "${each}.jpg" >/dev/null 2>/dev/null
+  printf %s ' Meta ...'
+  $genmeta "$each" "${each}.meta" >/dev/null 2>/dev/null
+  printf %s ' Tags ...'
   for tag in $*; do
     addtag "${each}.meta" "$tag"
   done
-  echo ' Done!'
+  printf 'Done!\n'
 fi; done