Fixed copy script

usnistgov · Oct 1, 2019 · 9db290c · 9db290c
1 parent 94454c0
commit 9db290c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -256,6 +256,7 @@ jobs: # a collection of
       - install-maven-dependencies
       - install-jq
       - install-prettyjson
+      - install-xmllint
       - run:
           name: Generate OSCAL converters
           command: |

diff --git a/build/ci-cd/copy-and-convert-content.sh b/build/ci-cd/copy-and-convert-content.sh
@@ -92,9 +92,8 @@ while IFS="|" read path format model converttoformats || [[ -n "$path" ]]; do
       file_relative=$(realpath --relative-to="${OSCALDIR}" "$file")
       dest="$WORKING_DIR/${file/$OSCALDIR\/src\//}"
       dest_dir=${dest%/*} # remove filename
-      dest_relative=$(realpath --relative-to="${WORKING_DIR}" "$dest")
-
       mkdir -p "$dest_dir"
+      dest_relative=$(realpath --relative-to="${WORKING_DIR}" "$dest")
       result=$(cp "$file" "$dest" 2>&1)
       cmd_exitcode=$?
       if [ $cmd_exitcode -ne 0 ]; then