Cleanups on js-precompiled (#3738)

* Cleanups on js-precompiled * Combined * Adjust based on Pr comments
openethereum · Dec 7, 2016 · 5f10218 · 5f10218
1 parent 9e8d90b
commit 5f10218
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/js/scripts/release.sh b/js/scripts/release.sh
@@ -34,11 +34,16 @@ git fetch origin 2>$GITLOG
 git checkout -b $BRANCH
 
 echo "*** Committing compiled files for $UTCDATE"
+mv build ../build.new
+git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
+git rm build/*
+git commit -m "$UTCDATE [rm]"
+mv -f ../build.new/* build/
+rm -rf ../build.new
 git add .
 git commit -m "$UTCDATE"
 
 echo "*** Merging remote"
-git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [release]"
 git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
 PRECOMPILED_HASH=`git rev-parse HEAD`