Split recursive option

3 files changed, 15 insertions, 7 deletions

diff --git a/lib/license/finder/ext/shared_helpers.rb b/lib/license/finder/ext/shared_helpers.rb
index c3e4a46..002a20e 100644
--- a/lib/license/finder/ext/shared_helpers.rb
+++ b/lib/license/finder/ext/shared_helpers.rb
@@ -3,11 +3,15 @@ module LicenseFinder
     class Cmd
       def self.run(command)
         stdout, stderr, status = Open3.capture3(command)
-        if ENV['CI_DEBUG_TRACE'] == 'true'
-          ::LicenseFinder::Core.default_logger.info(self.class, [command, stdout].join('\n'))
-        end
+        debug([command, stdout].join('\n'))
         [stdout, stderr, status]
       end
+
+      def self.debug(message)
+        return unless ENV['CI_DEBUG_TRACE'] == 'true'
+
+        ::LicenseFinder::Core.default_logger.info(self.class, message)
+      end
     end
   end
 end
diff --git a/run.sh b/run.sh
index c4c98e7..d3eb9d1 100755
--- a/run.sh
+++ b/run.sh
@@ -10,6 +10,8 @@ export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:-}
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export HISTFILESIZE=0
 export HISTSIZE=0
+export LM_RECURSIVE='--no-recursive'
+export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:='--no-debug'}
 export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
 export PREPARE="--prepare-no-fail"
 export RUBY_GC_HEAP_INIT_SLOTS=800000
@@ -72,8 +74,7 @@ function prepare_java() {
 }
 
 function prepare_dotnet() {
-  [[ $(ls ./*.sln 2> /dev/null) ]] && \
-    LICENSE_FINDER_CLI_OPTS="--recursive=true ${LICENSE_FINDER_CLI_OPTS:-}"
+  [[ $(ls ./*.sln 2> /dev/null) ]] && LM_RECURSIVE="--recursive"
 }
 
 function prepare_project() {
@@ -104,8 +105,10 @@ switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}"
 
 prepare_project
 [[ $CI_DEBUG_TRACE == 'true' ]] && debug_env
+
 scan_project "$PREPARE" \
   --format=json \
   --save="${LM_REPORT_FILE}" \
   --python-version="${python_version}" \
-  ${LICENSE_FINDER_CLI_OPTS:+--no-debug $LICENSE_FINDER_CLI_OPTS}
+  "$LM_RECURSIVE" \
+  "$LICENSE_FINDER_CLI_OPTS"
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 6d11ae5..16edc29 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -19,7 +19,8 @@ RSpec.describe "maven" do
 
       report = runner.scan(env: {
         'LICENSE_FINDER_CLI_OPTS' => "--maven-options=--settings my_settings.xml",
-        'CI_PROJECT_ID' => 'invalid'
+        'CI_PROJECT_ID' => 'invalid',
+        'CI_DEBUG_TRACE' => 'true'
       })
 
       expect(report).to match_schema(version: '2.0')