better template indexing...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

scripts/make-images.sh

@@ -223,20 +223,23 @@ getCaption(){
 	echo ${C[*]}
 }
 
-# XXX EXPERIMENTAL...
+# XXX EXPERIMENTAL index template variables...
-# index ${VAR} variables in templates...
 declare -A TEMPLATE_INDEX
+templateVars(){
+	if [ -z ${TEMPLATE_INDEX[$1]} ] ; then
+		TEMPLATE_INDEX[$1]=$(cat "$1" \
+			| grep -o '\${[A-Z0-9]\+}' \
+			| sed 's/\${\(.*\)}/\1/g' \
+			| sort)
+	fi
+	echo ${TEMPLATE_INDEX[$1]}
+}
 indexTemplates(){
 	#echo indexing templates...
-	local lst
 	local tpl
 	for tpl in "${TEMPLATE_PATH}"/* ; do
 		#echo ${tpl}...
-		lst=( $(cat "${tpl}" \
+		templateVars "${tpl}" > /dev/null
-			| grep -o '\${[A-Z0-9]\+}' \
-			| sed 's/\${\(.*\)}/\1/g' \
-			| sort) )
-		TEMPLATE_INDEX[$(basename "${tpl}")]=${lst[@]}
 	done
 }
 
@@ -273,6 +276,8 @@ anotatePath(){
 
 #----------------------------------------------------------------------
 
+#indexTemplates
+
 
 echo %----------------------------------------------------------------------
 echo %
@@ -431,6 +436,10 @@ for spread in "${IMAGE_DIR}"/* ; do
 		# formatting done...
 		[ -z $TEMPLATE ] && continue
 
+		# XXX index the manual template...
+		#if [ -z ${TEMPLATE_INDEX[$TEMPLATE]}] ; then
+		#fi
+
 		# format...
 		TEMPLATE=${TEMPLATE/$spread\//}
 		TEMPLATE=${TEMPLATE/[0-9]-/}