From 4964f8b480a68c170a3fc3a9ce401598c61b3982 Mon Sep 17 00:00:00 2001
From: Yash Goyal <yash.goyal@arm.com>
Date: Thu, 10 Jun 2021 16:20:22 -0500
Subject: [PATCH] Shortest url should be searched first

---
 identity-tools/generate-identity.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/identity-tools/generate-identity.sh b/identity-tools/generate-identity.sh
index 55ff4c9..32025c7 100755
--- a/identity-tools/generate-identity.sh
+++ b/identity-tools/generate-identity.sh
@@ -61,6 +61,12 @@ execute () {
                 cp ${IDENTITY_DIR}/identity.json ${IDENTITY_DIR}/identity_original.json
             fi
 
+            [[ $lwm2mserveruri == *"lwm2m"* ]] && commonaddr=${lwm2mserveruri#"lwm2m"}
+            [[ $lwm2mserveruri == *"udp-lwm2m"* ]] && commonaddr=${lwm2mserveruri#"udp-lwm2m"}
+            [[ $lwm2mserveruri == *"tcp-lwm2m"* ]] && commonaddr=${lwm2mserveruri#"tcp-lwm2m"}
+            [[ $lwm2mserveruri == *"lwm2m-udp"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-udp"}
+            [[ $lwm2mserveruri == *"lwm2m-tcp"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-tcp"}
+
             [[ $lwm2mserveruri == *"lwm2m-integration-lab"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-integration-lab"}
             [[ $lwm2mserveruri == *"udp-lwm2m-integration-lab"* ]] && commonaddr=${lwm2mserveruri#"udp-lwm2m-integration-lab"}
             [[ $lwm2mserveruri == *"tcp-lwm2m-integration-lab"* ]] && commonaddr=${lwm2mserveruri#"tcp-lwm2m-integration-lab"}
@@ -73,12 +79,6 @@ execute () {
             [[ $lwm2mserveruri == *"lwm2m-udp-os2"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-udp-os2"}
             [[ $lwm2mserveruri == *"lwm2m-tcp-os2"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-tcp-os2"}
 
-            [[ $lwm2mserveruri == *"lwm2m"* ]] && commonaddr=${lwm2mserveruri#"lwm2m"}
-            [[ $lwm2mserveruri == *"udp-lwm2m"* ]] && commonaddr=${lwm2mserveruri#"udp-lwm2m"}
-            [[ $lwm2mserveruri == *"tcp-lwm2m"* ]] && commonaddr=${lwm2mserveruri#"tcp-lwm2m"}
-            [[ $lwm2mserveruri == *"lwm2m-udp"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-udp"}
-            [[ $lwm2mserveruri == *"lwm2m-tcp"* ]] && commonaddr=${lwm2mserveruri#"lwm2m-tcp"}
-
             echo "common part of the address - $commonaddr"
             $CURR_DIR/developer_identity/create-dev-identity.sh\
                 -d \