fix(build): Updating scripts

Author: Kent C. Dodds

scripts/authorize-push.js

@@ -1,10 +1,10 @@
-var exec = require('child_process').exec
+var exec = require('child_process').exec;
 
-var GH_TOKEN = process.env.GH_TOKEN
-var repo = require('../package.json').repository.url
+var GH_TOKEN = process.env.GH_TOKEN;
+var repo = require('../package.json').repository.url;
 
 if (!(process.env.CI && GH_TOKEN && repo)) {
-  process.exit(1)
+  process.exit(1);
 }
 
 exec('git remote set-url origin ' + repo.replace('https://', 'https://' + GH_TOKEN + '@') + ' && ');

scripts/publish-latest.sh

@@ -1,12 +1,22 @@
 #!/bin/bash
-set -e # exit with non-zero exit code if there are failurs
+set -e # exit with non-zero exit code if there are failures
 
 F_VERSION=$1
+
+echo "shoing origin"
+git remote show origin
+
+echo "updating"
+git remote update
+
 echo "fetching"
 git fetch
 
 echo "checking out"
-git checkout -b latest origin/latest
+git checkout -b latest
+
+echo "mergin master"
+git merge origin/master -m "master merge" -X theirs
 
 echo "adding dist"
 git add dist