From e1f453126efbd5beff93741426de97e75817f562 Mon Sep 17 00:00:00 2001 From: Simen Sandvaer Date: Sun, 16 Oct 2022 21:46:20 +0200 Subject: [PATCH] Fixed running string as command, use it as input instead --- dist/platforms/ubuntu/steps/activate.sh | 5 +++-- dist/platforms/ubuntu/steps/test/services-config.json | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 dist/platforms/ubuntu/steps/test/services-config.json diff --git a/dist/platforms/ubuntu/steps/activate.sh b/dist/platforms/ubuntu/steps/activate.sh index c302417a..bff11d5f 100755 --- a/dist/platforms/ubuntu/steps/activate.sh +++ b/dist/platforms/ubuntu/steps/activate.sh @@ -86,9 +86,10 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then /opt/unity/Editor/Data/Resources/Licensing/Client/Unity.Licensing.Client --acquire-floating > license.txt #is this accessible in a env variable? PARSEDFILE=$(grep -oP '\".*?\"' < license.txt | tr -d '"') + echo "$PARSEDFILE" export FLOATING_LICENSE - FLOATING_LICENSE=$("$PARSEDFILE" | sed -n 2p) - FLOATING_LICENSE_TIMEOUT=$("$PARSEDFILE" | sed -n 4p) + FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE") + FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE") echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT" # Store the exit code from the verify command diff --git a/dist/platforms/ubuntu/steps/test/services-config.json b/dist/platforms/ubuntu/steps/test/services-config.json deleted file mode 100644 index d16a6d01..00000000 --- a/dist/platforms/ubuntu/steps/test/services-config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "licensingServiceBaseUrl": "test", - "enableEntitlementLicensing": true, - "enableFloatingApi": true, - "clientConnectTimeoutSec": 5, - "clientHandshakeTimeoutSec": 10 -}