Skip to content

Commit c3550cd

Browse files
committed
Merge branch 'develop' of https://github.com/LGE-OSS/fosslight_dependency into develop
2 parents 7777617 + 02d2156 commit c3550cd

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if __name__ == "__main__":
1414
setup(
1515
name = 'fosslight_dependency',
16-
version = '3.0.2',
16+
version = '3.0.3',
1717
packages = find_packages(),
1818
description = 'FOSSLight Dependency',
1919
long_description = 'It is a script file to scan dependencies through package manager file and generate a result report.',

unified_script/dependency_unified.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import requests
2121
import pkg_resources
2222

23-
VERSION = "3.0.2"
23+
VERSION = "3.0.3"
2424

2525
# Check the manifest file
2626
manifest_array = [["pip", "requirements.txt"], ["npm", "package.json"], ["maven", "pom.xml"],
@@ -29,7 +29,7 @@
2929
# binary url to check license text
3030
license_scanner_url_linux = "third_party/nomos/nomossa"
3131
license_scanner_url_macos = "third_party/askalono/askalono_macos"
32-
license_scanner_url_windows = "third_party/askalono/askalono.exe"
32+
license_scanner_url_windows = "third_party\\askalono\\askalono.exe"
3333

3434

3535
class HelpStop(Exception):
@@ -510,7 +510,12 @@ def check_license_scanner(os_name):
510510
logging.info("Not supported OS to analyze license text with binary.")
511511
return
512512

513-
data_path = os.path.join(os.path.dirname(__file__),license_scanner_url)
513+
try:
514+
base_path = sys._MEIPASS
515+
except Exception:
516+
base_path = os.path.dirname(__file__)
517+
518+
data_path = os.path.join(base_path, license_scanner_url)
514519
license_scanner_bin = data_path
515520

516521

0 commit comments

Comments
 (0)