EthanPisani/unity-builder
1
0
Fork 0
mirror of https://github.com/game-ci/unity-builder.git synced 2025-07-04 12:25:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(activate): only exit if activation fails

Browse Source
This commit is contained in:
Jibbajabbafic 2020-01-15 21:48:01 +00:00 committed by Webber Takken
parent a6607a341e
commit d27df56d26
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
builder/steps/activate.sh
View File

@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Try personal activation
if [[ -n "$UNITY_LICENSE" ]]; then
LICENSE_MODE="personal"
#
# PERSONAL LICENSE MODE
#
@ -42,23 +44,12 @@ if [[ -n "$UNITY_LICENSE" ]]; then
# TODO - Derive exit code by grepping success statement
UNITY_EXIT_CODE=$(echo $ACTIVATION_OUTPUT | grep 'config is NOT valid, switching to default' | wc -l)
# Display information about the result
if [ $UNITY_EXIT_CODE -eq 0 ]; then
echo "Activation (personal) complete."
else
echo "Unclassified error occured while trying to activate (personal) license."
echo "Exit code was: $UNITY_EXIT_CODE"
fi
# Remove license file
rm -f $FILE_PATH
# Exit with the code from the license verification step
if [ $UNITY_EXIT_CODE -ne 0 ]; then
exit $UNITY_EXIT_CODE
fi
# Try professional activation
elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
LICENSE_MODE="professional"
#
# PROFESSIONAL (SERIAL) LICENSE MODE
#
@ -66,6 +57,7 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
#
# Note: This is the preferred way for PROFESSIONAL LICENSES.
#
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
/opt/Unity/Editor/Unity \
-batchmode \
@ -79,18 +71,8 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
# Store the exit code from the verify command
UNITY_EXIT_CODE=$?
# Display information about the result
if [ $UNITY_EXIT_CODE -eq 0 ]; then
echo "Activation (professional) complete."
# Exit since personal and professional modes failed
else
echo "Unclassified error occured while trying to activate (professional) license."
echo "Exit code was: $UNITY_EXIT_CODE"
fi
# Exit with the code from the license verification step
exit $UNITY_EXIT_CODE
else
# Exit since no license and no serial number provided!
echo "No personal or professional licenses provided!"
echo "Please ensure you have setup one of these licensing methods:"
echo " - Personal: Set the UNITY_LICENSE environment variable."
@ -98,3 +80,13 @@ else
echo "See https://github.com/webbertakken/unity-builder#usage for details."
exit 1;
fi
# Display information about the result
if [ $UNITY_EXIT_CODE -eq 0 ]; then
echo "Activation ($LICENSE_MODE) complete."
else
# Exit with the code from the license verification step
echo "Unclassified error occured while trying to activate ($LICENSE_MODE) license."
echo "Exit code was: $UNITY_EXIT_CODE"
exit $UNITY_EXIT_CODE
fi