Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 6a3c34e

Browse files
committed
[FABG-780] Update regex, dependencies.sh
This change request fixes an issue when running `make populate` in the fabric-sdk-go directory using Windows 10 Git Bash (MINGW64). An error occurs reading, "test/scripts/dependencies.sh: line 104: unexpected argument `(' to conditional binary operator make: *** [depend] Error 2" So, I used the solution from [FABG-774] Updated regex to string, populate-vendor.sh, but adjusted for dependencies.sh. This patch runs correctly on Windows 10 using Git Bash and should run similarly to the [FABG-774] patch on other systems. Change-Id: I31c689b78cdea8492de9ce2062bffa8e095fb8be Signed-off-by: jvsclp <jvs@clpinc.com>
1 parent db2b8eb commit 6a3c34e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/scripts/dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ function installGoPkg {
101101

102102
function isScriptCurrent {
103103
declare filesModified=$(git diff --name-only --diff-filter=ACMRTUXBD HEAD | tr '\n' ' ' | xargs)
104-
if [[ "${filesModified}" =~ ( |^)(test/scripts/dependencies.sh)( |$) ]]; then
104+
declare matcher='( |^)(test/scripts/dependencies.sh)( |$)'
105+
if [[ "${filesModified}" =~ ${matcher} ]]; then
105106
echo "Dependencies script modified - will need to install dependencies"
106107
return 1
107108
fi

0 commit comments

Comments
 (0)