Merge pull request #2673 from ethcore/jg-update-js-precompiled

script to update js-precompiled
openethereum · Oct 17, 2016 · 357e482 · 357e482
2 parents 12b115b + 37399c0
commit 357e482
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/js/scripts/update-precompiled.sh b/js/scripts/update-precompiled.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+# change into the submodule build directory
+pushd `dirname $0`
+cd ../build
+
+if [ -z "$1" ]; then
+  popd
+  echo "Usage: $0 <sha-commit>"
+  exit 1
+fi
+
+git fetch origin $1
+git merge $1 -X theirs
+
+popd
+exit 0