removed redundant xvfb calls (part of the alias)

This commit is contained in:
BLaZeKiLL 2020-10-20 17:59:57 +05:30
parent 5b8f3cf342
commit ec0baa5d7b
3 changed files with 33 additions and 36 deletions

View File

@ -24,8 +24,7 @@ if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE" ]]; then
fi fi
# Activate license # Activate license
ACTIVATION_OUTPUT=$(xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ ACTIVATION_OUTPUT=$(unity-editor \
unity-editor \
-batchmode \ -batchmode \
-nographics \ -nographics \
-logFile /dev/stdout \ -logFile /dev/stdout \
@ -63,15 +62,14 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
echo "Requesting activation (professional license)" echo "Requesting activation (professional license)"
# Activate license # Activate license
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ unity-editor \
unity-editor \ -batchmode \
-batchmode \ -nographics \
-nographics \ -logFile /dev/stdout \
-logFile /dev/stdout \ -quit \
-quit \ -serial "$UNITY_SERIAL" \
-serial "$UNITY_SERIAL" \ -username "$UNITY_EMAIL" \
-username "$UNITY_EMAIL" \ -password "$UNITY_PASSWORD"
-password "$UNITY_PASSWORD"
# Store the exit code from the verify command # Store the exit code from the verify command
UNITY_EXIT_CODE=$? UNITY_EXIT_CODE=$?

View File

@ -108,24 +108,24 @@ echo "# Building platform #"
echo "###########################" echo "###########################"
echo "" echo ""
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ unity-editor \
unity-editor \ -batchmode \
-batchmode \ -nographics \
-logfile /dev/stdout \ -logfile /dev/stdout \
-quit \ -quit \
-customBuildName "$BUILD_NAME" \ -customBuildName "$BUILD_NAME" \
-projectPath "$UNITY_PROJECT_PATH" \ -projectPath "$UNITY_PROJECT_PATH" \
-buildTarget "$BUILD_TARGET" \ -buildTarget "$BUILD_TARGET" \
-customBuildTarget "$BUILD_TARGET" \ -customBuildTarget "$BUILD_TARGET" \
-customBuildPath "$CUSTOM_BUILD_PATH" \ -customBuildPath "$CUSTOM_BUILD_PATH" \
-executeMethod "$BUILD_METHOD" \ -executeMethod "$BUILD_METHOD" \
-buildVersion "$VERSION" \ -buildVersion "$VERSION" \
-androidVersionCode "$ANDROID_VERSION_CODE" \ -androidVersionCode "$ANDROID_VERSION_CODE" \
-androidKeystoreName "$ANDROID_KEYSTORE_NAME" \ -androidKeystoreName "$ANDROID_KEYSTORE_NAME" \
-androidKeystorePass "$ANDROID_KEYSTORE_PASS" \ -androidKeystorePass "$ANDROID_KEYSTORE_PASS" \
-androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \ -androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \
-androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \ -androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \
$CUSTOM_PARAMETERS $CUSTOM_PARAMETERS
# Catch exit code # Catch exit code
BUILD_EXIT_CODE=$? BUILD_EXIT_CODE=$?

View File

@ -6,11 +6,10 @@ if [[ -n "$UNITY_SERIAL" ]]; then
# #
# This will return the license that is currently in use. # This will return the license that is currently in use.
# #
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ unity-editor \
unity-editor \ -batchmode \
-batchmode \ -nographics \
-nographics \ -logFile /dev/stdout \
-logFile /dev/stdout \ -quit \
-quit \ -returnlicense
-returnlicense
fi fi