Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Isolate SBOM PATH flag
[releng/global-jjb.git]
/
shell
/
sbom-generator.sh
diff --git
a/shell/sbom-generator.sh
b/shell/sbom-generator.sh
index
f3e657b
..
8b1fd35
100644
(file)
--- a/
shell/sbom-generator.sh
+++ b/
shell/sbom-generator.sh
@@
-25,8
+25,12
@@
if ! wget -nv "${URL}" -O "${SBOM_LOCATION}"; then
echo "wget ${SBOM_GENERATOR_VERSION} failed"
exit 1;
fi
echo "wget ${SBOM_GENERATOR_VERSION} failed"
exit 1;
fi
-tar -xvf "${SBOM_LOCATION}"
+# Extract SBOM bin in SBOM_PATH
+# This is a workaround until the --path flag works
+# https://github.com/opensbom-generator/spdx-sbom-generator/issues/227
+tar -xzf "${SBOM_LOCATION}" -C ${SBOM_PATH}
echo "INFO: running spdx-sbom-generator"
echo "INFO: running spdx-sbom-generator"
+cd ${SBOM_PATH}
./spdx-sbom-generator "${SBOM_FLAGS:-}" -o "${WORKSPACE}"/m2repo
mv spdx-sbom-generator /tmp/
rm /tmp/spdx*
./spdx-sbom-generator "${SBOM_FLAGS:-}" -o "${WORKSPACE}"/m2repo
mv spdx-sbom-generator /tmp/
rm /tmp/spdx*