qi-hardware/ben-wpan
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-22 20:03:09 +02:00
Code

Despite trying to be careful with quoting, some spaces in file names still

Browse Source 
did upset things.

- scripts/schhist2web: backticks in command invocation need quoting
- scripts/schhist2web: the change below needs a bashism, so we switch from
  /bin/sh to /bin/bash
- scripts/schhist2web: seems that there's no safe way to use ls -1 in the
  word list of "for". Use while read ...; ... done < <(ls -1) instead.
  (We couldn't just pipe this into the while loop, because that would put
  the loop into a subshell and changes to global variables would thus be
  lost.)
This commit is contained in:
Werner Almesberger 2010-08-29 03:41:54 -03:00
parent 02e2bf542f
commit cfbdd45323
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/schhist2web
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# schhist2web - Web-browseable graphical revision history of schematics # schhist2web - Web-browseable graphical revision history of schematics
# #
@ -208,12 +208,12 @@ for n in $first `cd "$dir" && git rev-list --reverse $first..HEAD`; do
if [ ! -z "$head" ]; then if [ ! -z "$head" ]; then
prev="$cache/ppm_$head"/`basename "$m"` prev="$cache/ppm_$head"/`basename "$m"`
if [ -r "$prev" ] && cmp -s "$prev" "$m"; then if [ -r "$prev" ] && cmp -s "$prev" "$m"; then
symlink "../ppm_$head"/`basename "$m"` "$m" symlink "../ppm_$head/`basename \"$m\"`" "$m"
symlink "../fat_$head"/`basename "$m"` \ symlink "../fat_$head/`basename \"$m\"`" \
"$cache/fat_$n"/`basename "$m"` "$cache/fat_$n/`basename \"$m\"`"
fi fi
fi fi
touch "$out/names/"`basename "$m" .ppm` touch "$out/names/`basename \"$m\" .ppm`"
done done
trap 0 trap 0
head=$n head=$n
@ -249,9 +249,9 @@ EOF
<TABLE bgcolor="$BG_COLOR" callpadding=1> <TABLE bgcolor="$BG_COLOR" callpadding=1>
<TR bgcolor="$FNAME_COLOR"> <TR bgcolor="$FNAME_COLOR">
EOF EOF
for m in `ls -1 "$out/names"`; do while read m; do
echo "<TD><B>$m</B>" echo "<TD><B>$m</B>"
done done < <(ls -1 "$out/names")
} >"$index" } >"$index"
@ -264,7 +264,7 @@ for n in `cd "$dir" && git rev-list $first..HEAD~1` $first; do
empty=true empty=true
s="<TR>" s="<TR>"
mkdir -p "$out/diff_$next" "$out/thumb_$next" mkdir -p "$out/diff_$next" "$out/thumb_$next"
for m in `ls -1 "$out/names"`; do while read m; do
a="$cache/ppm_$n/$m.ppm" a="$cache/ppm_$n/$m.ppm"
fat_a="$cache/fat_$n/$m.ppm" fat_a="$cache/fat_$n/$m.ppm"
b="$cache/ppm_$next/$m.ppm" b="$cache/ppm_$next/$m.ppm"
@ -298,7 +298,7 @@ for n in `cd "$dir" && git rev-list $first..HEAD~1` $first; do
s= s=
empty=false empty=false
echo "<A href=\"diff_$next/$m.png\"><IMG src=\"thumb_$next/$m.png\"></A>" >>"$index" echo "<A href=\"diff_$next/$m.png\"><IMG src=\"thumb_$next/$m.png\"></A>" >>"$index"
done done < <(ls -1 "$out/names")
if ! $empty; then if ! $empty; then
echo "$s<TD valign=\"middle\">" >>"$index" echo "$s<TD valign=\"middle\">" >>"$index"
commit_entry "$dir" $next >>"$index" commit_entry "$dir" $next >>"$index"
@ -314,7 +314,7 @@ if [ -d "$cache/ppm_$next" ]; then # could this ever be false ?
empty=true empty=true
echo "<TR>" >>"$index" echo "<TR>" >>"$index"
mkdir -p "$out/diff_$next" "$out/thumb_$next" mkdir -p "$out/diff_$next" "$out/thumb_$next"
for m in `ls -1 "$out/names"`; do while read m; do
ppm="$cache/ppm_$next/$m.ppm" ppm="$cache/ppm_$next/$m.ppm"
fat="$cache/fat_$next/$m.ppm" fat="$cache/fat_$next/$m.ppm"
diff="$out/diff_$next/$m.png" diff="$out/diff_$next/$m.png"
@ -327,7 +327,7 @@ if [ -d "$cache/ppm_$next" ]; then # could this ever be false ?
|| exit || exit
empty=false empty=false
echo "<A href=\"diff_$next/$m.png\"><IMG src=\"thumb_$next/$m.png\"></A>" >>"$index" echo "<A href=\"diff_$next/$m.png\"><IMG src=\"thumb_$next/$m.png\"></A>" >>"$index"
done done < <(ls -1 "$out/names")
if ! $empty; then if ! $empty; then
echo "<TD valign=\"middle\">" >>"$index" echo "<TD valign=\"middle\">" >>"$index"
commit_entry "$dir" $next >>"$index" commit_entry "$dir" $next >>"$index"