diff --git a/generate_changemarks.sh b/generate_changemarks.sh index 5fd64d8a953fcd1c35235cd623df8bfd8c8c44a1..5d5dedca139bee3efbdf6a939e96548cb13bcadc 100644 --- a/generate_changemarks.sh +++ b/generate_changemarks.sh @@ -29,33 +29,37 @@ echo "PROJECT NAME:" $PROJECT_NAME echo "PROJECT ID:" $2 echo "MERGE IID:" $3 -echo "\n------ Generating change marks MD --------" +echo "\n------ Generating changed clauses --------" #docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$PROJECT_NAME" "$3" docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" changemarks -o "/tmp/out" "$HOST_URL" "$2" "$3" -echo "\n------ Generating changemarks docx --------" -for i in out/*.md ; do - DOCUMENT_NAME=$(echo $i | cut -d'/' -f 2) - echo "\n------ Preparaing spec --------" - docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" pandocFilter -o "/tmp/out" "/tmp/$i" - echo "\n------ Publishing spec --------" - docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t docx --reference-doc "/data/${7}" -o "/data/out/${DOCUMENT_NAME}.docx" - #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t html -o "/data/out/${DOCUMENT_NAME}.html" +#echo "\n------ Generating changemarks docx --------" +#for i in out/*.md ; do + #DOCUMENT_NAME=$(echo $i | cut -d'/' -f 2) + #echo "\n------ Preparing spec --------" + #docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" pandocFilter -o "/tmp/out" "/tmp/$i" + #echo "Pandoc filter processed file $DOCUMENT_NAME" + #echo "\n------ Publishing spec --------" + #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t docx --reference-doc "/data/${7}" -o "/data/out/${DOCUMENT_NAME}.docx" + #echo "Pandoc converted file $DOCUMENT_NAME" + + # Trying converting to HTML and then to DOCX + #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t html -o "/data/out/${DOCUMENT_NAME}.html" #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/out/${DOCUMENT_NAME}.html" -f html -t docx --reference-doc "Spec-template.docx" -o "/data/out/${DOCUMENT_NAME}.docx" -done - -echo "\n------ Combining docx --------" -#docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "/tmp/out/" --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3" -docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "out/" --preprocessor onem2m --token ${8} --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3" - -echo "\n------ Converting to tracked changes docx --------" -for i in docs/*.docx ; do - DOCUMENT_NAME=$(echo $i | cut -d'/' -f 2) - docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" addTrackedChanges -o "/tmp/docs/$DOCUMENT_NAME" "/tmp/$i" "$HOST_URL" "$2" "$3" -done -for filename in docs/*.docx; do - mv $filename ${filename%.*}_revisionMarks\(informative\).docx; done; - #mv "$filename" "prefix_${filename}"; done; + +#done + +#echo "\n------ Combining docx --------" +#docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "out/" --preprocessor onem2m --token ${8} --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3" + +#echo "\n------ Converting to tracked changes docx --------" +#for i in docs/*.docx ; do +# DOCUMENT_NAME=$(echo $i | cut -d'/' -f 2) +# docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" addTrackedChanges -o "/tmp/docs/$DOCUMENT_NAME" "/tmp/$i" "$HOST_URL" "$2" "$3" +#done +#for filename in docs/*.docx; do +# mv $filename ${filename%.*}_revisionMarks\(informative\).docx; done; +# echo "\n------ Generating change marks --------" docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --extension "png" --extension "jpg" --extension "svg" --extension "md" --preprocessor onem2m --token ${8} --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3"