From c466e856146ef78ec0a32b0f81636f9d600cd4a9 Mon Sep 17 00:00:00 2001
From: mDuo13 <mduo13@gmail.com>
Date: Wed, 7 Mar 2018 16:07:06 -0800
Subject: [PATCH] Fix all-target-link-checker var clash

---
 tool/all-target-link-checker.sh | 5 +++--
 tool/jenkins.sh                 | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tool/all-target-link-checker.sh b/tool/all-target-link-checker.sh
index 1daeadc8ce..33cdcc1377 100755
--- a/tool/all-target-link-checker.sh
+++ b/tool/all-target-link-checker.sh
@@ -2,9 +2,10 @@
 mkdir -p out
 
 # Pass forward dactyl "vars" arg if provided
-if [ -n "$1" ];
+if [ "$1" == "--vars" ] && [ -n "$2" ];
 then
-  dactyl_vars=$1
+  dactyl_vars=$2
+  shift 2
 fi
 
 targets=`dactyl_build -lq | awk '{print $1}'`
diff --git a/tool/jenkins.sh b/tool/jenkins.sh
index 016130ff9a..bcf2511caf 100755
--- a/tool/jenkins.sh
+++ b/tool/jenkins.sh
@@ -11,7 +11,8 @@ gitForkWithoutSuffix=${ghprbAuthorRepoGitUrl%.git}
 
 if [ -n "$ghprbPullId" ];
 then
-  dactyl_vars="'"'{"github_forkurl": "'"$gitForkWithoutSuffix"'", "github_branch": "'"$ghprbSourceBranch"'", "github_pr_id": "'"$ghprbPullId"'", "is_pr_build": true}'"'"
+  echo '{"github_forkurl": "'"$gitForkWithoutSuffix"'", "github_branch": "'"$ghprbSourceBranch"'", "github_pr_id": "'"$ghprbPullId"'", "is_pr_build": true}' > pr_vars.json
+  dactyl_vars="pr_vars.json"
 else
   dactyl_vars=""
 fi
@@ -19,4 +20,4 @@ fi
 set -e
 
 tool/conflictmarkers.sh
-tool/all-target-link-checker.sh "$dactyl_vars"
+tool/all-target-link-checker.sh --vars "$dactyl_vars"