move diff file naming into build script

TrustedComputingGroup · Sep 5, 2024 · cd41547 · cd41547
1 parent 17f4d17
commit cd41547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/actions/render/action.yml b/.github/actions/render/action.yml
@@ -52,7 +52,7 @@ runs:
         /usr/bin/build.sh
         --versioned_filenames
         $( [ -n "${{ inputs.pr-repo }}" -a -n "${{ inputs.pr-number }}" ]   && echo --pr_number=${{ inputs.pr-number }} --pr_repo=${{ inputs.pr-repo }} )
-        $( [ ${{ inputs.pdf }} -a -n "${{ inputs.diffbase }}" ]             && echo --diffbase=${{ inputs.diffbase }} --diffpdf=${{ inputs.output-basename }}.$(echo ${{ inputs.diffbase }} | cut -c1-20).diff.pdf --diffpdflog=${{ inputs.output-basename }}.$(echo ${{ inputs.diffbase }} | cut -c1-20).diff.pdf.log )
+        $( [ ${{ inputs.pdf }} -a -n "${{ inputs.diffbase }}" ]             && echo --diffbase=${{ inputs.diffbase }} --diffpdf=${{ inputs.output-basename }}.diff.pdf --diffpdflog=${{ inputs.output-basename }}.diff.pdf.log )
         $( ${{ inputs.pdf }}                                                && echo --pdf=${{ inputs.output-basename }}.pdf --pdflog=${{ inputs.output-basename }}.pdf.log )
         $( ${{ inputs.html }}                                               && echo --html=${{ inputs.output-basename }}.html )
         $( ${{ inputs.docx }}                                               && echo --docx=${{ inputs.output-basename }}.docx )

diff --git a/build.sh b/build.sh
@@ -378,7 +378,7 @@ if [ "${VERSIONED_FILENAMES}" == "yes" ]; then
 		PDF_OUTPUT=$(prefix_filename "${version_prefix}" "${PDF_OUTPUT}")
 	fi
 	if [ ! -z "${DIFFPDF_OUTPUT}" ]; then
-		DIFFPDF_OUTPUT=$(prefix_filename "${DIFFBASE}_to_${version_prefix}" "${DIFFPDF_OUTPUT}")
+		DIFFPDF_OUTPUT=$(prefix_filename "$(echo ${DIFFBASE} | cut -c1-20).to.${version_prefix}" "${DIFFPDF_OUTPUT}")
 	fi
 	if [ ! -z "${LATEX_OUTPUT}" ]; then
 		LATEX_OUTPUT=$(prefix_filename "${version_prefix}" "${LATEX_OUTPUT}")