From ca59b992d7a749078256ea505659c714db99a30c Mon Sep 17 00:00:00 2001 From: JustArchi Date: Wed, 5 Dec 2018 23:23:59 +0100 Subject: [PATCH] Update cc.sh --- cc.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cc.sh b/cc.sh index 6bb477ac7..fa09d669e 100755 --- a/cc.sh +++ b/cc.sh @@ -56,16 +56,17 @@ fi if [[ -f "ASF-ui/package.json" ]] && hash npm 2>/dev/null; then echo "Building ASF UI..." - if [[ -d "ASF-ui/dist" ]]; then - # ASF-ui doesn't clean itself after old build - rm -rf "ASF-ui/dist" - fi + # ASF-ui doesn't clean itself after old build + rm -rf "ASF-ui/dist" cd ASF-ui npm i git checkout -- package.json package-lock.json # Until we can switch to npm ci, avoid any changes to source files done by npm i npm run-script deploy cd .. + + # ASF's output www folder needs cleaning as well + rm -rf "${MAIN_PROJECT}/${OUT}/www" else echo "WARNING: ASF UI dependencies are missing, skipping build of ASF UI..." fi