From 33d9a1171d2fdc1574623515164cb39a0fef45f2 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 16 Nov 2021 10:19:15 +0100 Subject: [PATCH] clean up asset folder with git clean command instead of hard deletion --- graph-explorer/Makefile | 4 ++-- ocs/Makefile | 3 +-- web/Makefile | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index ae3917574b1..06a1f012ae0 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -31,5 +31,5 @@ ci-node-generate: pull-assets .PHONY: pull-assets pull-assets: - @rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ - + @git clean -xfd assets + @curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ diff --git a/ocs/Makefile b/ocs/Makefile index a605985649e..76c0c9398ff 100644 --- a/ocs/Makefile +++ b/ocs/Makefile @@ -28,5 +28,4 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target @go generate ./... .PHONY: ci-node-generate -ci-node-generate: - @make -C ../accounts ci-node-generate +ci-node-generate: diff --git a/web/Makefile b/web/Makefile index c5eb711e123..31eacfdeb96 100644 --- a/web/Makefile +++ b/web/Makefile @@ -33,4 +33,5 @@ WEB_ASSETS_VERSION = v4.4.0 .PHONY: pull-assets pull-assets: - @rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/ + @git clean -xfd assets + @curl -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/