From 2bb18751e64dd23837d89fa166b53357f606eca4 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Wed, 17 May 2017 01:37:30 +0200 Subject: [PATCH] tools: git output and pull fallback --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 103a3be..64e034b 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,8 @@ data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf data/xcolors/themes: data/xcolors data/xcolors: - [ -r $@/.git ] && cd $@ && git pull --ff-only + @echo git pull or clone $@ + @[ -r $@/.git ] && cd $@ && git pull --ff-only || true @[ -e $@ ] || git clone https://github.com/tlatsas/xcolors $@ data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes @@ -94,7 +95,8 @@ data/browser: data/browser/support.inc.pl data/browser/usage-wm.inc.pl data/browser/caniuse/data.json: data/browser/caniuse data/browser/caniuse: - [ -r $@/.git ] && cd $@ && git pull --ff-only + @echo git pull or clone $@ + @[ -r $@/.git ] && cd $@ && git pull --ff-only || true @[ -e $@ ] || git clone https://github.com/Fyrd/caniuse.git $@ data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/data.json -- 2.30.0