comparison makeWeb.sh @ 505:b6e4f4d7665a build-default-214

Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Mon, 30 Jun 2014 10:02:49 +0100
parents 4cc739fe13ab
children 36d43edbd3f5
comparison
equal deleted inserted replaced
503:56ddc6ef7b1a 505:b6e4f4d7665a
50 exit 1 50 exit 1
51 fi 51 fi
52 52
53 dir=`pwd` 53 dir=`pwd`
54 54
55 booke=$1
56 masterbooke=$2
55 bookedir=$dir/$1 57 bookedir=$dir/$1
58 masterbookedir=$dir/$2
56 webdir=$dir/web/$1 59 webdir=$dir/web/$1
57 graphicsdir=$dir/graphics/$1 60 graphicsdir=$dir/graphics/$1
58 output=index.html 61 output=index.html
59 tunelist=tunelist.html 62 tunelist=tunelist.html
60 booke=$1
61 masterbooke=$2
62 title=$booke 63 title=$booke
63 instrument=$3 64 instrument=$3
64 abc2xml=$dir/abc2xml/abc2xml.py 65 abc2xml=$dir/abc2xml/abc2xml.py
65 66
66 buildno=`cat buildno.txt` 67 buildno=`cat buildno.txt`
124 credit=`$dir/abcfield.py --field N --contains "Credit:" $filename | sed -e "s/Credit: *//"` 125 credit=`$dir/abcfield.py --field N --contains "Credit:" $filename | sed -e "s/Credit: *//"`
125 creditvisibility="no" 126 creditvisibility="no"
126 if [ -n "$credit" ]; then 127 if [ -n "$credit" ]; then
127 creditvisibility="yes" 128 creditvisibility="yes"
128 fi 129 fi
129 lastchanged=`hg log --limit 1 --template "{date|shortdate}" $filename` 130 lastchanged=`hg log --limit 1 --template "{date|shortdate}" $masterbookedir/${name}.abc`
130 key=`$dir/abcfield.py --field K $filename` 131 key=`$dir/abcfield.py --field K $filename`
131 fixkey $key 132 fixkey $key
132 key=$retval 133 key=$retval
133 134
134 # Copy the ABC into the web. 135 # Copy the ABC into the web.