Merge branch 'bug-fixes' into 'master'v3.1.1

Fix usage of SETUP_CMD

See merge request gitlab-org/security-products/license-management!122

5 files changed, 26 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4538573..bbaee95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.1.1
+
+- Fix invocation of `SETUP_CMD`. (!122)
+
 ## v3.1.0
 
 - Forward custom `MAVEN_CLI_OPTS` to `LicenseFinder` so that it can use it in the license scan task. (!120)
diff --git a/Gemfile.lock b/Gemfile.lock
index 7dfdc77..68c0773 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-management (3.1.0)
+    license-management (3.1.1)
       license_finder (~> 6.0.0)
 
 GEM
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index ca107df..308a738 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.1.0'
+    VERSION = '3.1.1'
   end
 end
diff --git a/run.sh b/run.sh
index e18ae43..af1ed79 100755
--- a/run.sh
+++ b/run.sh
@@ -87,7 +87,8 @@ function prepare_project() {
     prepare_dotnet || true
   else
     echo "Running '${SETUP_CMD}' to install project dependencies..."
-    "${SETUP_CMD[@]}"
+    # shellcheck disable=SC2068
+    ${SETUP_CMD[@]}
     PREPARE="--no-prepare"
   fi
 }
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 8d1ad20..dbcfa5e 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -27,4 +27,22 @@ RSpec.describe "maven" do
       expect(report[:dependencies]).to match_array([{ name: 'mvn-spike', url: '', description: '', paths: ['.'], licenses: ['MIT'] }])
     end
   end
+
+  describe "When using the `SETUP_CMD`" do
+    it 'executes the custom script' do
+      runner.add_file('custom.sh') do
+        <<~SCRIPT
+        #!/bin/bash -l
+
+        echo 'hello'
+        SCRIPT
+      end
+
+      report = runner.scan(env: {
+        'SETUP_CMD' => 'bash custom.sh'
+      })
+
+      expect(report).to match_schema(version: '2.0')
+    end
+  end
 end