From: Mischa POSLAWSKY Date: Tue, 16 May 2017 23:37:30 +0000 (+0200) Subject: tools: git output and pull fallback X-Git-Tag: v1.10~2 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/2bb18751e64dd23837d89fa166b53357f606eca4 tools: git output and pull fallback --- 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