From 82338d974f42149e70f9163567940453f8f18b79 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Tue, 10 Nov 2020 01:30:35 +0000
Subject: fix: detect maven wrapper in sub directory

* chore: fix bin scripts
---
 bin/docker-shell | 9 ++++++---
 bin/setup        | 2 +-
 bin/test         | 6 +-----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/docker-shell b/bin/docker-shell
index d75bd7c..07b2a70 100755
--- a/bin/docker-shell
+++ b/bin/docker-shell
@@ -5,9 +5,12 @@ set -e
 cd "$(dirname "$0")/.."
 
 IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
+root_dir=/builds/gitlab-org/security-products/analyzers/license-finder
 
 docker run --rm -it \
-  --entrypoint='' \
+  --entrypoint='bash' \
   --network=host \
-  --volume "$PWD":/builds/gitlab-org/security-products/analyzers/license-finder \
-  "$IMAGE_NAME" sh -c 'cd /builds/gitlab-org/security-products/analyzers/license-finder && exec bash -l'
+  --env=RUBYLIB="${root_dir}/lib" \
+  --workdir="${root_dir}" \
+  --volume "$PWD":"${root_dir}" \
+  "$IMAGE_NAME" -l
diff --git a/bin/setup b/bin/setup
index 685cc71..a5e5130 100755
--- a/bin/setup
+++ b/bin/setup
@@ -4,7 +4,7 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+export PATH="$PWD/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 if [ ! -f /usr/sbin/haproxy ] && command -v apt-get; then
   curl https://haproxy.debian.net/bernat.debian.org.gpg | apt-key add -
diff --git a/bin/test b/bin/test
index dfa6900..4f81615 100755
--- a/bin/test
+++ b/bin/test
@@ -4,10 +4,6 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export RUBYLIB="/builds/gitlab-org/security-products/analzyers/license-finder/lib"
+export PATH="$PWD/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-if ! command -v bundle; then
-  ./bin/setup
-fi
 bundle exec rspec "$@" --format=progress
-- 
cgit v1.2.3