Update cc.sh

This commit is contained in:
JustArchi
2018-12-05 23:23:59 +01:00
parent a67139a5c2
commit ca59b992d7

9
cc.sh
View File

@@ -56,16 +56,17 @@ fi
if [[ -f "ASF-ui/package.json" ]] && hash npm 2>/dev/null; then if [[ -f "ASF-ui/package.json" ]] && hash npm 2>/dev/null; then
echo "Building ASF UI..." echo "Building ASF UI..."
if [[ -d "ASF-ui/dist" ]]; then # ASF-ui doesn't clean itself after old build
# ASF-ui doesn't clean itself after old build rm -rf "ASF-ui/dist"
rm -rf "ASF-ui/dist"
fi
cd ASF-ui cd ASF-ui
npm i 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 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 npm run-script deploy
cd .. cd ..
# ASF's output www folder needs cleaning as well
rm -rf "${MAIN_PROJECT}/${OUT}/www"
else else
echo "WARNING: ASF UI dependencies are missing, skipping build of ASF UI..." echo "WARNING: ASF UI dependencies are missing, skipping build of ASF UI..."
fi fi