From d601eaa2723a9212b97beac3e2dff533e9c02bd4 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 8 Mar 2023 20:08:57 +0300 Subject: [PATCH] bugfix... Signed-off-by: Alex A. Naanou --- .../spreads/{-03 => -03-disabled}/01.txt | 0 .../spreads/{-03 => -03-disabled}/02.txt | 0 .../spreads/{00 => 00-text-only}/text.txt | 0 .../spreads/{01 => 01-image-text}/01.png | Bin .../spreads/{01 => 01-image-text}/02.txt | 0 .../{02 => 02-two-images-local-caption}/01.png | Bin .../{02 => 02-two-images-local-caption}/02.png | Bin .../{02 => 02-two-images-local-caption}/02.txt | 0 .../spreads/{04 => 04-manual-template}/01.png | Bin .../{04 => 04-manual-template}/fullbleed.tpl | 0 scripts/make-images.sh | 9 ++++----- 11 files changed, 4 insertions(+), 5 deletions(-) rename examples/spread generation/spreads/{-03 => -03-disabled}/01.txt (100%) rename examples/spread generation/spreads/{-03 => -03-disabled}/02.txt (100%) rename examples/spread generation/spreads/{00 => 00-text-only}/text.txt (100%) rename examples/spread generation/spreads/{01 => 01-image-text}/01.png (100%) rename examples/spread generation/spreads/{01 => 01-image-text}/02.txt (100%) rename examples/spread generation/spreads/{02 => 02-two-images-local-caption}/01.png (100%) rename examples/spread generation/spreads/{02 => 02-two-images-local-caption}/02.png (100%) rename examples/spread generation/spreads/{02 => 02-two-images-local-caption}/02.txt (100%) rename examples/spread generation/spreads/{04 => 04-manual-template}/01.png (100%) rename examples/spread generation/spreads/{04 => 04-manual-template}/fullbleed.tpl (100%) diff --git a/examples/spread generation/spreads/-03/01.txt b/examples/spread generation/spreads/-03-disabled/01.txt similarity index 100% rename from examples/spread generation/spreads/-03/01.txt rename to examples/spread generation/spreads/-03-disabled/01.txt diff --git a/examples/spread generation/spreads/-03/02.txt b/examples/spread generation/spreads/-03-disabled/02.txt similarity index 100% rename from examples/spread generation/spreads/-03/02.txt rename to examples/spread generation/spreads/-03-disabled/02.txt diff --git a/examples/spread generation/spreads/00/text.txt b/examples/spread generation/spreads/00-text-only/text.txt similarity index 100% rename from examples/spread generation/spreads/00/text.txt rename to examples/spread generation/spreads/00-text-only/text.txt diff --git a/examples/spread generation/spreads/01/01.png b/examples/spread generation/spreads/01-image-text/01.png similarity index 100% rename from examples/spread generation/spreads/01/01.png rename to examples/spread generation/spreads/01-image-text/01.png diff --git a/examples/spread generation/spreads/01/02.txt b/examples/spread generation/spreads/01-image-text/02.txt similarity index 100% rename from examples/spread generation/spreads/01/02.txt rename to examples/spread generation/spreads/01-image-text/02.txt diff --git a/examples/spread generation/spreads/02/01.png b/examples/spread generation/spreads/02-two-images-local-caption/01.png similarity index 100% rename from examples/spread generation/spreads/02/01.png rename to examples/spread generation/spreads/02-two-images-local-caption/01.png diff --git a/examples/spread generation/spreads/02/02.png b/examples/spread generation/spreads/02-two-images-local-caption/02.png similarity index 100% rename from examples/spread generation/spreads/02/02.png rename to examples/spread generation/spreads/02-two-images-local-caption/02.png diff --git a/examples/spread generation/spreads/02/02.txt b/examples/spread generation/spreads/02-two-images-local-caption/02.txt similarity index 100% rename from examples/spread generation/spreads/02/02.txt rename to examples/spread generation/spreads/02-two-images-local-caption/02.txt diff --git a/examples/spread generation/spreads/04/01.png b/examples/spread generation/spreads/04-manual-template/01.png similarity index 100% rename from examples/spread generation/spreads/04/01.png rename to examples/spread generation/spreads/04-manual-template/01.png diff --git a/examples/spread generation/spreads/04/fullbleed.tpl b/examples/spread generation/spreads/04-manual-template/fullbleed.tpl similarity index 100% rename from examples/spread generation/spreads/04/fullbleed.tpl rename to examples/spread generation/spreads/04-manual-template/fullbleed.tpl diff --git a/scripts/make-images.sh b/scripts/make-images.sh index c77ef38..9ae4424 100644 --- a/scripts/make-images.sh +++ b/scripts/make-images.sh @@ -708,10 +708,9 @@ for spread in ${SPREADS[@]} ; do l=$(( l - 1 )) continue # skip temporarily disabled... - elif [[ "${spread}" =~ -.* ]] ; then + elif [[ "${spread}" =~ [\\\/]-.*$ ]] ; then SKIP_FIRST=1 - echo "% spread: ${spread/-/}: skipped..." | tee >(cat >&2) - echo % + echo "% spread: ${spread}: skipped..." | tee >(cat >&2) continue fi @@ -735,8 +734,8 @@ for spread in ${SPREADS[@]} ; do fi SKIP_FIRST=1 - printf "Spread ($c/$l): ${spread/-/} \r" >&2 - echo "% spread: ${spread/-/}" + printf "Spread ($c/$l): ${spread} \r" >&2 + echo "% spread: ${spread}" handleSpread "$spread" d=$(( d + 1 ))