From b44440fa3a2b5800c8110f8b72708afb766f34b1 Mon Sep 17 00:00:00 2001
From: Simen Sandvaer <simen.is@gmail.com>
Date: Fri, 14 Oct 2022 22:25:54 +0200
Subject: [PATCH] Checking licensing server first for now, since serial is
 always set

---
 dist/platforms/ubuntu/steps/return_license.sh | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dist/platforms/ubuntu/steps/return_license.sh b/dist/platforms/ubuntu/steps/return_license.sh
index da7d440e..971b3878 100755
--- a/dist/platforms/ubuntu/steps/return_license.sh
+++ b/dist/platforms/ubuntu/steps/return_license.sh
@@ -4,17 +4,8 @@
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
-if [[ -n "$UNITY_SERIAL" ]]; then
-  #
-  # PROFESSIONAL (SERIAL) LICENSE MODE
-  #
-  # This will return the license that is currently in use.
-  #
-  unity-editor \
-    -logFile /dev/stdout \
-    -quit \
-    -returnlicense
-elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
+
+if [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
   #
   # Return any floating license used.
   #
@@ -27,7 +18,16 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
       echo "status $status"
       echo "Returned $token"
   done
-
+elif [[ -n "$UNITY_SERIAL" ]]; then
+  #
+  # PROFESSIONAL (SERIAL) LICENSE MODE
+  #
+  # This will return the license that is currently in use.
+  #
+  unity-editor \
+    -logFile /dev/stdout \
+    -quit \
+    -returnlicense
 fi
 
 # Return to previous working directory