fix: make SCM_URL correct

Author: d2lam

index.js

@@ -279,13 +279,12 @@ class GithubScm extends Scm {
 
         // Git clone
         command.push(`echo Cloning ${checkoutUrl}, on branch ${config.branch}`);
-        command.push(`if [ $SCM_CLONE_TYPE = ssh ]; then export SCM_URL=${sshCheckoutUrl}; `
-                    + `else export SCM_URL=${checkoutUrl}; fi`); // use url that corresponds to clone type
-        command.push('if [ $SCM_CLONE_TYPE != ssh ] && ' // for private repos (must use https)
-            + '[ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then '
-            + 'SCM_URL="$SCM_USERNAME:$SCM_ACCESS_TOKEN@$SCM_URL"; fi');
+        command.push(`if [[ $SCM_CLONE_TYPE = 'ssh' ]]; then export SCM_URL=${sshCheckoutUrl}; ` +
+            'elif [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; ' +
+            `then export SCM_URL=https://$SCM_USERNAME:$SCM_ACCESS_TOKEN@${checkoutUrl}; ` +
+            `else export SCM_URL=https://${checkoutUrl}; fi`);
         command.push(`git clone --quiet --progress --branch ${config.branch} `
-            + 'https://$SCM_URL $SD_SOURCE_DIR');
+            + '$SCM_URL $SD_SOURCE_DIR');
         // Reset to SHA
         command.push(`git reset --hard ${checkoutRef}`);
         command.push(`echo Reset to ${checkoutRef}`);

test/data/commands.json

@@ -1,4 +1,4 @@
 {
     "name": "sd-checkout-code",
-    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [ $SCM_CLONE_TYPE = ssh ]; then export SCM_URL=git@github.com:screwdriver-cd/guide; else export SCM_URL=github.com/screwdriver-cd/guide; fi && if [ $SCM_CLONE_TYPE != ssh ] && [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then SCM_URL=\"$SCM_USERNAME:$SCM_ACCESS_TOKEN@$SCM_URL\"; fi && git clone --quiet --progress --branch branchName https://$SCM_URL $SD_SOURCE_DIR && git reset --hard 12345 && echo Reset to 12345 && echo Setting user name and user email && git config user.name sd-buildbot && git config user.email dev-null@screwdriver.cd"
+    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [[ $SCM_CLONE_TYPE = 'ssh' ]]; then export SCM_URL=git@github.com:screwdriver-cd/guide; elif [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then export SCM_URL=https://$SCM_USERNAME:$SCM_ACCESS_TOKEN@github.com/screwdriver-cd/guide; else export SCM_URL=https://github.com/screwdriver-cd/guide; fi && git clone --quiet --progress --branch branchName $SCM_URL $SD_SOURCE_DIR && git reset --hard 12345 && echo Reset to 12345 && echo Setting user name and user email && git config user.name sd-buildbot && git config user.email dev-null@screwdriver.cd"
 }

test/data/customPrCommands.json

@@ -1,4 +1,4 @@
 {
     "name": "sd-checkout-code",
-    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [ $SCM_CLONE_TYPE = ssh ]; then export SCM_URL=git@github.com:screwdriver-cd/guide; else export SCM_URL=github.com/screwdriver-cd/guide; fi && if [ $SCM_CLONE_TYPE != ssh ] && [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then SCM_URL=\"$SCM_USERNAME:$SCM_ACCESS_TOKEN@$SCM_URL\"; fi && git clone --quiet --progress --branch branchName https://$SCM_URL $SD_SOURCE_DIR && git reset --hard branchName && echo Reset to branchName && echo Setting user name and user email && git config user.name pqrs && git config user.email dev-null@my.email.com && echo Fetching PR and merging with branchName && git fetch origin pull/3/head:pr && git merge --no-edit 12345"
+    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [[ $SCM_CLONE_TYPE = 'ssh' ]]; then export SCM_URL=git@github.com:screwdriver-cd/guide; elif [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then export SCM_URL=https://$SCM_USERNAME:$SCM_ACCESS_TOKEN@github.com/screwdriver-cd/guide; else export SCM_URL=https://github.com/screwdriver-cd/guide; fi && git clone --quiet --progress --branch branchName $SCM_URL $SD_SOURCE_DIR && git reset --hard branchName && echo Reset to branchName && echo Setting user name and user email && git config user.name pqrs && git config user.email dev-null@my.email.com && echo Fetching PR and merging with branchName && git fetch origin pull/3/head:pr && git merge --no-edit 12345"
 }

test/data/prCommands.json

@@ -1,4 +1,4 @@
 {
     "name": "sd-checkout-code",
-    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [ $SCM_CLONE_TYPE = ssh ]; then export SCM_URL=git@github.com:screwdriver-cd/guide; else export SCM_URL=github.com/screwdriver-cd/guide; fi && if [ $SCM_CLONE_TYPE != ssh ] && [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then SCM_URL=\"$SCM_USERNAME:$SCM_ACCESS_TOKEN@$SCM_URL\"; fi && git clone --quiet --progress --branch branchName https://$SCM_URL $SD_SOURCE_DIR && git reset --hard branchName && echo Reset to branchName && echo Setting user name and user email && git config user.name sd-buildbot && git config user.email dev-null@screwdriver.cd && echo Fetching PR and merging with branchName && git fetch origin pull/3/head:pr && git merge --no-edit 12345"
+    "command": "echo Cloning github.com/screwdriver-cd/guide, on branch branchName && if [[ $SCM_CLONE_TYPE = 'ssh' ]]; then export SCM_URL=git@github.com:screwdriver-cd/guide; elif [ ! -z $SCM_USERNAME ] && [ ! -z $SCM_ACCESS_TOKEN ]; then export SCM_URL=https://$SCM_USERNAME:$SCM_ACCESS_TOKEN@github.com/screwdriver-cd/guide; else export SCM_URL=https://github.com/screwdriver-cd/guide; fi && git clone --quiet --progress --branch branchName $SCM_URL $SD_SOURCE_DIR && git reset --hard branchName && echo Reset to branchName && echo Setting user name and user email && git config user.name sd-buildbot && git config user.email dev-null@screwdriver.cd && echo Fetching PR and merging with branchName && git fetch origin pull/3/head:pr && git merge --no-edit 12345"
 }