s4

changeset 42:0e3164b11ec0

find changesets by author, revision, files, or words in the commit message
Illegal use of $tmpd fixed in blog_showentry
author HIROSE Yuuji <yuuji@gentei.org>
date Wed, 22 Jul 2015 16:42:21 +0900
parents ce13cad6b99d
children 7defa2416356
files s4-blog.sh
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Wed Jul 22 16:36:08 2015 +0900
     1.2 +++ b/s4-blog.sh	Wed Jul 22 16:42:21 2015 +0900
     1.3 @@ -31,10 +31,11 @@
     1.4    # $1=table $2=rowid
     1.5    if [ -n "$2" ]; then
     1.6      if [ -n "$imgcached" ]; then
     1.7 -      tmpd=$tmpdir/$imgcached/$thumbxy
     1.8 +      bstmpdir=$tmpdir/$imgcached/$thumbxy
     1.9      else
    1.10 -      tmpd=`mktempd`
    1.11 -      tmpfiles=$tmpfiles" $tmpd"
    1.12 +      bstmpdir=$tmpd
    1.13 +      # tmpd=`mktempd`
    1.14 +      # tmpfiles=$tmpfiles" $tmpd"
    1.15      fi
    1.16    fi
    1.17    tbl=${1%%[!A-Z0-9a-z_]*} rowid=${2%%[!A-Z0-9a-z_]*}
    1.18 @@ -126,7 +127,7 @@
    1.19      arid=${a%%|*} aid=`echo "$a"|cut -d'|' -f2` author=${a##*|} imgs=""
    1.20  err a=$a, aid=$aid, author=$author
    1.21      # name=''	# Get gecos??
    1.22 -    td=$(echo $tmpd/`echo $a|md5`)
    1.23 +    td=$(echo $bstmpdir/`echo $a|md5`)
    1.24      val=`getvalbyid article image $arid $td`
    1.25  err val="[$val]" and td as follows:
    1.26