Update document version generation for preamble.tex

.gitignore

@@ -7,11 +7,11 @@
 *~
 
 # Temporary generate-pdfs.sh files
-*.tmp.lyx
-*.tmp.pdf
+.generated.version
 
-# Autogenerated pgfplots/tikz figures
+# Autogenerated pgfplots/tikz figures, pgfplotstable tables
 .generated.*-figure*.*
+.generated.*-table*.*
 
 # Temporary lyx/tex files
 *.aux

generate-pdfs.sh

@@ -4,27 +4,29 @@ set -e
 [[ ! `which git` ]] && { echo "git is required" 1>&2; exit 1; }
 [[ ! `which lyx` ]] && { echo "lyx is required" 1>&2; exit 1; }
 
-deleteTmpLyx(){
-	find "$PWD" -name '*.tmp.lyx' -delete
+deleteGeneratedTmpFiles(){
+	find "$PWD" -name '.generated.version' -delete
 }
 
 touchedLyxFileBases=()
 
 deleteAllTmp(){
+	deleteGeneratedTmpFiles
+
 	local tmpFiles=()
 
 	for touchedLyxFileBase in "${touchedLyxFileBases[@]}"; do
-		for rmfile in "$touchedLyxFileBase".{aux,log,out,tex,nlo,toc,lof,lot,synctex,tmp.lyx,tmp.pdf}; do
+		for rmfile in "$touchedLyxFileBase".{aux,log,out,tex,nlo,toc,lof,lot,synctex}; do
 			[[ -s "$rmfile" ]] && tmpFiles+=("$rmfile");
 		done;
 	done;
 
-	rm "${tmpFiles[@]}"
+	(( "${#tmpFiles[@]}" > 0 )) && rm "${tmpFiles[@]}"
 }
 
 trap 'deleteAllTmp' EXIT
 
-deleteTmpLyx
+deleteGeneratedTmpFiles
 
 description=$(git describe --tags --match 'v[0-9]*' --always --dirty='-SNAPSHOT')
 logfile="$(basename "$BASH_SOURCE").log"
@@ -33,20 +35,18 @@ echo "Version $description"
 
 for lyx in $(find "$PWD" -name '*.lyx');
 do
-	folder="$(dirname '$lyx')"
+	folder="$(dirname "$lyx")"
 	base="${lyx%.lyx}"
 
 	echo -n "Generating $lyx ... "
 
-	cd "$folder"
+	pushd "$folder" > /dev/null
+	echo "$description" > ".generated.version"
 
-	# Hacky rewrite of .lyx file
-	cat "$base.lyx" | sed "s/(Unknown~document~version)/$description/" > "$base.tmp.lyx"
 	touchedLyxFileBases+=("$base")
-	lyx --force-overwrite --export pdf2 "$base.tmp.lyx" &> "$logfile"
-	mv "$base.tmp.pdf" "$base.pdf"
+	lyx --force-overwrite --export pdf2 "$lyx" &> "$logfile"
 
 	echo "done."
 
-	cd - > /dev/null
+	popd > /dev/null
 done

report/preamble.tex

@@ -36,7 +36,15 @@
 
 \usepackage{numprint}
 
-\providecommand{\versiononly}{(Unknown~document~version)}
+\newcommand{\readsinglelinefile}[1]{
+	\newread\inputstream%
+	\immediate\openin\inputstream=#1%
+	\immediate\read\inputstream to \singlelinecontents%
+	\singlelinecontents%
+	\immediate\closein\inputstream%
+}
+
+\providecommand{\versiononly}{\IfFileExists{.generated.version}{\readsinglelinefile{.generated.version}}{(Unknown~document~version)}}%
 \providecommand{\versionandtoday}{\versiononly~--~\today}
 
 \providecommand{\recentlyupdated}{\emph\textsc\textcolor{updated}{ ~Updated!~ }}