Merge pull request #19 from PelionIoT/fix-derivation

Shortest url should be searched first
PelionIoT · Jun 10, 2021 · f90c6a0 · f90c6a0
2 parents fa514bf + 4964f8b
commit f90c6a0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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 \