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
6 changes: 5 additions & 1 deletion src/fosslight_dependency/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021 LG Electronics Inc.
# SPDX-License-Identifier: Apache-2.0
from fosslight_util.help import PrintHelpMsg
from fosslight_util.help import PrintHelpMsg, print_package_version

_HELP_MESSAGE_DEPENDENCY = """
Usage: fosslight_dependency [option1] <arg1> [option2] <arg2>...
Expand Down Expand Up @@ -64,6 +64,10 @@
"""


def print_version(pkg_name: str) -> None:
print_package_version(pkg_name, "FOSSLight Dependency Scanner Version:")


def print_help_msg():
helpMsg = PrintHelpMsg(_HELP_MESSAGE_DEPENDENCY)
helpMsg.print_help_msg(True)
7 changes: 2 additions & 5 deletions src/fosslight_dependency/run_dependency_scanner.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import platform
import sys
import argparse
import pkg_resources
import warnings
from datetime import datetime
import logging
Expand All @@ -16,7 +15,7 @@
from collections import defaultdict
from fosslight_util.set_log import init_log
import fosslight_util.constant as constant
from fosslight_dependency._help import print_help_msg
from fosslight_dependency._help import print_version, print_help_msg
from fosslight_dependency._analyze_dependency import analyze_dependency
from fosslight_util.output_format import check_output_formats_v2, write_output_file
from fosslight_util.oss_item import ScannerItem
Expand Down Expand Up @@ -361,9 +360,7 @@ def main():
print_help_msg()

if args.version: # -v option
cur_version = pkg_resources.get_distribution(_PKG_NAME).version
print(f"FOSSLight Dependency Scanner Version: {cur_version}")
sys.exit(0)
print_version(_PKG_NAME)

if args.manager: # -m option
package_manager = ''.join(args.manager)
Expand Down
Loading