From 4c8df0cd81a32e004bbd5424f81e64660c2a7e24 Mon Sep 17 00:00:00 2001 From: Frederic Hamel Date: Sun, 4 Apr 2021 11:07:31 -0400 Subject: [PATCH] Fix codeboot build --- makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index b66c70ae..6b887a43 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ ZIPI_REPO ?= git@github.com:udem-dlteam/zipi -ZIPI_BRANCH ?= +ZIPI_BRANCH ?= codeboot ZIPI_FOR_CODEBOOT = zipi-for-codeboot PYTHON38 ?= $(ZIPI_FOR_CODEBOOT)/venv/bin/python @@ -8,10 +8,8 @@ all: bundle $(ZIPI_FOR_CODEBOOT): rm -rf ./$(ZIPI_FOR_CODEBOOT) @if test "$(ZIPI_BRANCH)" != "" || echo $(ZIPI_REPO) | grep "^\(http://\|https://\|git@\)" > /dev/null; then \ - echo "git clone $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \ - git clone $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \ - echo "cd ./$(ZIPI_FOR_CODEBOOT) && git checkout $(if $(ZIPI_BRANCH),$(ZIPI_BRANCH),master)"; \ - cd ./$(ZIPI_FOR_CODEBOOT) && git checkout $(if $(ZIPI_BRANCH),$(ZIPI_BRANCH),master); \ + echo "git clone --branch=codeboot $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \ + git clone --branch=$(ZIPI_BRANCH) $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \ else \ echo "cp -r $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \ cp -r $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \ @@ -80,5 +78,6 @@ codeboot.bundle.js: include/jquery-3.2.1.min.js include/jquery.clippy.min.js inc echo >> $@; \ done + clean: rm -rf ./$(ZIPI_FOR_CODEBOOT) codeboot.bundle.js codeboot.bundle.css