From 9b255a23e01cb7bcaf4b7af33c85dbea298aabf1 Mon Sep 17 00:00:00 2001 From: f Date: Thu, 6 May 2021 17:56:34 -0300 Subject: [PATCH] ajustes en el makefile --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 757be734..a00b18e8 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +.SHELL := /bin/bash # Incluir las variables de entorno mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) root_dir := $(patsubst %/,%,$(dir $(mkfile_path))) @@ -53,10 +54,12 @@ save: date +%F | xargs git tag -f @echo -e "\a" -# Crear el directorio donde se almacenan las gemas binarias +# proyectos. ../gems/: mkdir -p $@ +# Crear el directorio donde se almacenan las gemas binarias +# TODO: Mover a un proyecto propio, porque lo utilizamos en todos los gem_dir := $(shell readlink -f ../gems) gem_cache_dir := $(gem_dir)/cache gem_binary_dir := $(gem_dir)/$(alpine_version) @@ -92,18 +95,12 @@ dirs := $(patsubst %,root/%,data sites deploy public) $(dirs): mkdir -p $@ -app/assets/fonts/forkawesome-webfont.woff2: fa.txt - which glyphhanger || npm i -g glyphhanger - grep -v "^#" fa.txt | sed "s/^/U+/" | cut -d " " -f 1 | tr "\n" "," | xargs -rI {} glyphhanger --subset=node_modules/fork-awesome/fonts/forkawesome-webfont.ttf --formats=woff2 --whitelist="{}" - mv node_modules/fork-awesome/fonts/forkawesome-webfont-subset.woff2 $@ - -fa: app/assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome - ota: assets sudo chgrp -R 82 public/ - rsync -av --delete-after public/ athshe:/srv/sutty/srv/http/data/_public/ + rsync -avi --delete-after public/ athshe:/srv/sutty/srv/http/data/_public/ # Hotfixes +commit ?= origin/rails ota-rb: umask 022; git format-patch $(commit) scp ./0*.patch root@athshe.sutty.nl:/tmp/