X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fcommon.sh;h=4242aab3807ae9738ba86f4a79d6ad42bab84762;hb=30ac844acd16c48c632232285259a2fc449a58ce;hp=ecf16c2596eacba18f6e696b43bee5d8bab64308;hpb=926ffb4fb96b4def0a1144c7c1ec2e46891d271e;p=serve0 diff --git a/pages/common.sh b/pages/common.sh index ecf16c2..4242aab 100755 --- a/pages/common.sh +++ b/pages/common.sh @@ -1,6 +1,6 @@ #!/bin/zsh -# Copyright 2014, 2015 Paul Hänsch +# Copyright 2014 - 2016 Paul Hänsch # # This file is part of Serve0. # @@ -28,7 +28,7 @@ page_link='' [ -n "$order" ] && page_link="${page_link}o=${order}&" [ -n "$search" ] && page_link="${page_link}s=${search}&" [ -n "$filter" ] && page_link="${page_link}f=${filter}&" -page_prev="${page_link}pn=$([ "$page" -le "$pagesize" ] && echo 1 || echo $(($page - $pagesize)) )" +[ "$page" -le "$pagesize" ] && page_prev="${page_link}pn=1" || page_prev="${page_link}pn=$(($page - $pagesize))" page_next="${page_link}pn=$(($page + $pagesize))" page_this="${page_link}pn=$page" @@ -42,7 +42,7 @@ else sed -n '2s:|:\n:gp' "$each" done \ | sort - echo + printf \\n ) | (while read tag; do if [ "$tag" = "$lasttag" ]; then tagcount=$(( ${tagcount:-0} + 1 )) @@ -53,7 +53,7 @@ else lasttag="$tag" done \ | sort -rn - echo + printf \\n ) | while read x tag; do topcnt=$(grep "${tag%%:*}" ${_DATA}/cache/taglist |wc -l) [ $topcnt -lt 10 ] \ @@ -68,7 +68,7 @@ fi ) list_categories(){ - echo none + printf none\\n printf %s "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u }