From 328db0c124a59680fc6e13c73832c419f0d0c6f5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 8 Dec 2016 15:39:27 +0100 Subject: [PATCH] Replace build directory completely (#3748) --- js/scripts/release.sh | 6 +++--- js/scripts/test.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index aaafba87e..1cf3095ef 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -38,10 +38,10 @@ mv build ../build.new git add . git commit -m "$UTCDATE [update]" git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" -git rm build/* +git rm -r build +rm -rf build git commit -m "$UTCDATE [cleanup]" -mv -f ../build.new/* build/ -rm -rf ../build.new +mv ../build.new build git add . git commit -m "$UTCDATE [release]" diff --git a/js/scripts/test.js b/js/scripts/test.js index ded13a298..318fd7c84 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script 3 +// test script 4