fix(lib.sh): sprites examples were not loaded properly in sprites.md

tmorin · Feb 18, 2020 · eed8ae7 · eed8ae7
1 parent 8f230b4
commit eed8ae7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/aws-v3/sprites.md b/aws-v3/sprites.md
@@ -110,52 +110,52 @@ rectangle aSprite as "<$SpriteGroupVpcSubnetPublic>"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsEc2ContainerRegistry>"
 ```
-![SpriteAwsEc2ContainerRegistry](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=0&SpriteAwsEc2ContainerRegistry)
+![SpriteAwsEc2ContainerRegistry](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=13&SpriteAwsEc2ContainerRegistry)
 ## SpriteAwsElasticContainer
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsElasticContainer>"
 ```
-![SpriteAwsElasticContainer](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=1&SpriteAwsElasticContainer)
+![SpriteAwsElasticContainer](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=14&SpriteAwsElasticContainer)
 ## SpriteAwsElasticContainerContainer
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsElasticContainerContainer>"
 ```
-![SpriteAwsElasticContainerContainer](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=2&SpriteAwsElasticContainerContainer)
+![SpriteAwsElasticContainerContainer](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=15&SpriteAwsElasticContainerContainer)
 ## SpriteAwsElasticContainerService
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsElasticContainerService>"
 ```
-![SpriteAwsElasticContainerService](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=3&SpriteAwsElasticContainerService)
+![SpriteAwsElasticContainerService](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=16&SpriteAwsElasticContainerService)
 ## SpriteAwsElasticContainerTask
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsElasticContainerTask>"
 ```
-![SpriteAwsElasticContainerTask](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=4&SpriteAwsElasticContainerTask)
+![SpriteAwsElasticContainerTask](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=17&SpriteAwsElasticContainerTask)
 ## SpriteAwsElasticKubernetes
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsElasticKubernetes>"
 ```
-![SpriteAwsElasticKubernetes](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=5&SpriteAwsElasticKubernetes)
+![SpriteAwsElasticKubernetes](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=18&SpriteAwsElasticKubernetes)
 ## SpriteAwsFargate
 ```plantuml
 !global $AWS_LIB_BRANCH="master"
 !global $AWS_LIB_BASE_URL="https://raw.githubusercontent.com/tmorin/plantuml-libs/" + $AWS_LIB_BRANCH + "/aws-v3"
 !includeurl $AWS_LIB_BASE_URL/library.puml
 rectangle aSprite as "<$SpriteAwsFargate>"
 ```
-![SpriteAwsFargate](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=6&SpriteAwsFargate)
+![SpriteAwsFargate](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/tmorin/plantuml-libs/master/aws-v3/sprites.exp.puml&idx=19&SpriteAwsFargate)
diff --git a/lib.sh b/lib.sh
@@ -205,23 +205,24 @@ generateSprites() {
     echo "' the content of this file has been automatically generated" > ${sptExp}
     # documentation
     echo "# Sprites" > ${sptDoc}
-    index=0
+    local sptIndex=$(grep -e "^sprite" ${sptSrc} | wc -l)
     # iterate over elements directories
     for clause in $(sed -r 's/,/ /g' <<< ${sptIconsClauses}) ; do
         IFS=':' read -r sptIconsDir sptPrefix <<< ${clause}
         find ${sptIconsDir} -type f -name "*.${iconsFormat}" -print | sort |
         while read -r iconFile; do
             local sptName="Sprite${sptPrefix}$(basename ${iconFile%.*})"
-            generateSprite ${libName} ${iconFile} ${sptName} "${index}"
-            index=$((index+1))
+            generateSprite ${libName} ${iconFile} ${sptName} ${sptIndex}
+            sptIndex=$((sptIndex+1))
         done
     done
+    sptIndex=$(grep -e "^sprite" ${sptSrc} | wc -l)
     # iterate over CSV entries
     tail -n +2 ${sptCsv} | while IFS=, read -r Name Element; do
         local iconFile="${iconsDir}/${Element}.${iconsFormat}"
         local sptName="Sprite${Name}"
-        generateSprite ${libName} ${iconFile} ${sptName} "${index}"
-        index=$((index+1))
+        generateSprite ${libName} ${iconFile} ${sptName} ${sptIndex}
+        sptIndex=$((sptIndex+1))
     done
     echo "@enduml" >> ${sptSrc}
 }
@@ -240,6 +241,7 @@ generateSprite() {
     local sptSrc="${libName}/sprites.puml"
     local sptExp="${libName}/sprites.exp.puml"
     local sptDoc="${libName}/sprites.md"
+    echo "[${libName}] - generate sprite #${index} (${iconFile})"
     # source
     convert -quality 100 -background white -flatten -resize x20 ${iconFile} ${tmpDir}/${sptName}
     java -jar tmp/plantuml.jar -encodesprite 16z ${tmpDir}/${sptName} >> ${sptSrc}