Fix bug when multi-repos clone includes a repo name containing a . (#37)

Added more tests to cover this scenario

Author: markphip

src/external-repository/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "External Git Repository in Codespace",
     "id": "external-repository",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "description": "Configures Codespace to work with an external Git repository",
     "options": {
         "gitProvider": {

src/external-repository/scripts/clone.sh

@@ -131,8 +131,8 @@ if [ ${#EXT_GIT_REPO_URL_ARRAY[@]} -gt 1 ]; then
     for i in "${EXT_GIT_REPO_URL_ARRAY[@]}"; do
         # Set the repo URL to the current value
         REPO_URL=$i
-        # Get the folder name from the last part of the URL
-        REPO_FOLDER=$(echo "${REPO_URL}" | awk -F'/' '{print $NF}' | awk -F'.' '{print $1}')
+        # Get the folder name from the last part of the URL (dropping .git if necessary)
+        REPO_FOLDER=$(echo "${REPO_URL}" | sed 's/\.git$//;s#.*/##')
         LOCAL_PATH=${EXT_GIT_LOCAL_PATH}/${REPO_FOLDER}
         # Clone the repo
         clone_repository ${REPO_URL} ${LOCAL_PATH}

src/external-repository/scripts/setup-user.sh

@@ -176,8 +176,8 @@ if [ ${#EXT_GIT_REPO_URL_ARRAY[@]} -gt 1 ]; then
     for i in "${EXT_GIT_REPO_URL_ARRAY[@]}"; do
         # Set the repo URL to the current value
         REPO_URL=$i
-        # Get the folder name from the last part of the URL
-        REPO_FOLDER=$(echo "${REPO_URL}" | awk -F'/' '{print $NF}' | awk -F'.' '{print $1}')
+        # Get the folder name from the last part of the URL (dropping .git if necessary)
+        REPO_FOLDER=$(echo "${REPO_URL}" | sed 's/\.git$//;s#.*/##')
         LOCAL_PATH=${EXT_GIT_LOCAL_PATH}/${REPO_FOLDER}
         # Clone the repo
         configure_git_for_user ${LOCAL_PATH}

test/external-repository/multi-install.sh

@@ -8,7 +8,7 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "git-config-1" grep "ado-auth-helper" <(cat /tmp/multi-repos/community/.git/config)
 check "git-config-2" grep "ado-auth-helper" <(cat /tmp/multi-repos/spec/.git/config)
-check "git-config-3" grep "ado-auth-helper" <(cat /tmp/multi-repos/action/.git/config)
+check "git-config-3" grep "ado-auth-helper" <(cat /tmp/multi-repos/devcontainers.github.io/.git/config)
 
 # Report result
 reportResults

test/external-repository/scenarios.json

@@ -13,7 +13,7 @@
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "external-repository": {
-                "cloneUrl": "https://github.com/devcontainers/community,https://github.com/devcontainers/spec,https://github.com/devcontainers/action",
+                "cloneUrl": "https://github.com/devcontainers/community,https://github.com/devcontainers/spec.git,https://github.com/devcontainers/devcontainers.github.io",
                 "folder": "/tmp/multi-repos"
             }
         },