Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ py-tlsh
pytz
XlsxWriter
PyYAML
fosslight_util>=2.1.0
fosslight_util>=2.1.6
dependency-check
13 changes: 8 additions & 5 deletions src/fosslight_binary/binary_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,15 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
for i, output_extension in enumerate(output_extensions):
if output_files[i] is None or output_files[i] == "":
if formats:
if formats[i].startswith('spdx'):
if platform.system() != 'Windows':
output_files[i] = f"fosslight_spdx_bin_{start_time}"
else:
logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
if platform.system() == 'Windows':
logger.warning(f'{formats[i]} is not supported on Windows. Please remove {formats[i]} from format.')
to_remove.append(i)
else:
if formats[i].startswith('spdx'):
output_files[i] = f"fosslight_spdx_bin_{start_time}"
elif formats[i].startswith('cyclonedx'):
output_files[i] = f'fosslight_cyclonedx_bin_{start_time}'
else:
if output_extension == _json_ext:
output_files[i] = f"fosslight_opossum_bin_{start_time}"
Expand Down
Loading