summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-03-07 15:26:37 -0700
committermo khan <mo.khan@gmail.com>2020-03-07 15:26:37 -0700
commit558c8ca5ff4d8635b60e05c4f5a18fe7d1058514 (patch)
treec19c9f37a3f19a56c8687ac650340bbe015ad5af
parent09e3c5b986ed0251dd45e1854ad8ef304fe46952 (diff)
Fix shellcheck error
-rw-r--r--lib/license/finder/ext.rb2
-rwxr-xr-xrun.sh5
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/license/finder/ext.rb b/lib/license/finder/ext.rb
index 7bd85df..91bf297 100644
--- a/lib/license/finder/ext.rb
+++ b/lib/license/finder/ext.rb
@@ -26,7 +26,7 @@ module LicenseFinder
class Cmd
def self.run(command)
stdout, stderr, status = Open3.capture3(command)
- puts stdout if ENV['LM_DEBUG']
+ puts stdout unless ENV['LM_DEBUG'].nil? || ENV['LM_DEBUG'].empty?
[stdout, stderr, status]
end
end
diff --git a/run.sh b/run.sh
index a3959cf..b28937e 100755
--- a/run.sh
+++ b/run.sh
@@ -9,7 +9,6 @@ export BUNDLE_WITHOUT="development:test"
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export HISTFILESIZE=0
export HISTSIZE=0
-export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:-'--no-debug'}
export LM_DEBUG=${LM_DEBUG:-}
export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
export PREPARE="--prepare-no-fail"
@@ -69,7 +68,7 @@ function prepare_java() {
function prepare_dotnet() {
[[ $(ls ./*.sln 2> /dev/null) ]] && \
- LICENSE_FINDER_CLI_OPTS="--recursive=true $LICENSE_FINDER_CLI_OPTS"
+ LICENSE_FINDER_CLI_OPTS="--recursive=true ${LICENSE_FINDER_CLI_OPTS:-}"
}
function prepare_project() {
@@ -104,4 +103,4 @@ scan_project "$PREPARE" \
--format=json \
--save="${LM_REPORT_FILE}" \
--python-version="${python_version}" \
- $LICENSE_FINDER_CLI_OPTS
+ ${LICENSE_FINDER_CLI_OPTS:+--no-debug $LICENSE_FINDER_CLI_OPTS}