From b040ea203e9a9288408e6a11bfaf30d2cea4729c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sat, 25 Jan 2020 12:19:04 +0100
Subject: [PATCH] Update makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 29aa5327c..994d1eb22 100644
--- a/Makefile
+++ b/Makefile
@@ -12,30 +12,30 @@ sign_dir=$(build_dir)/sign
 cert_dir=$(HOME)/.nextcloud/certificates
 
 
-default: package 
+default: build
 
 clean-build:
 	rm -rf $(build_dir)
 
 clean-dist:
-	rm -rf js/node_modules
+	rm -rf node_modules/
 
 install-deps: install-deps-js
 	composer install
 
 install-deps-js:
-	cd js && npm install
+	npm ci
 
-build: install-deps build-js
+build: clean-dist install-deps build-js
 
 build-js: install-deps-js
-	cd js && npm run build 
+	npm run build
 
 build-js-dev: install-deps
-	cd js && npm run dev
+	npm run dev
 
 watch:
-	cd js && npm run watch
+	npm run watch
 
 # appstore: clean install-deps
 appstore: clean-build build
@@ -96,7 +96,7 @@ test-integration:
 	cd tests/integration && ./run.sh
 
 test-js: install-deps
-	cd js && run test
+	npm run test
 
 package:
 	krankerl package