From 33280cf9415bbb44b0230bffbc7e8b16ac67f2aa Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 10 Dec 2023 16:52:03 -0800
Subject: [PATCH] Fix activate error checking

---
 dist/platforms/ubuntu/activate.sh       | 5 +----
 dist/platforms/ubuntu/return_license.sh | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dist/platforms/ubuntu/activate.sh b/dist/platforms/ubuntu/activate.sh
index db84d0aa..5a42f1c2 100755
--- a/dist/platforms/ubuntu/activate.sh
+++ b/dist/platforms/ubuntu/activate.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
+if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
   #
   # SERIAL LICENSE MODE
   #
@@ -98,6 +98,3 @@ else
   echo "::error ::There was an error while trying to activate the Unity license."
   exit $UNITY_EXIT_CODE
 fi
-
-# Return to previous working directory
-popd
diff --git a/dist/platforms/ubuntu/return_license.sh b/dist/platforms/ubuntu/return_license.sh
index 0015d5d2..3555e1de 100755
--- a/dist/platforms/ubuntu/return_license.sh
+++ b/dist/platforms/ubuntu/return_license.sh
@@ -20,6 +20,3 @@ elif [[ -n "$UNITY_SERIAL" ]]; then
     -password "$UNITY_PASSWORD" \
     -projectPath "/BlankProject"
 fi
-
-# Return to previous working directory
-popd