From 56355204839a4e780a35a2013230d929162f310c Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 5 Sep 2016 16:12:58 +0200 Subject: [PATCH] correcting generate-assets.sh script and Makefile (thanks Krytarik) --- Makefile | 2 ++ scripts/generate-assets.sh | 17 +++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d10b401..3b4858a 100755 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ css: $(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320) gresource: css + scripts/generate-assets.sh $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR320) $(RES_DIR320)/gtk.gresource.xml @@ -30,6 +31,7 @@ clean: rm -f $(RES_DIR)/gtk.gresource rm -rf $(DIST_DIR320) rm -f $(RES_DIR320)/gtk.gresource + rm -f assets/*.png install: all install -d -m755 $(INSTALL_DIR) diff --git a/scripts/generate-assets.sh b/scripts/generate-assets.sh index 1808902..73e4998 100755 --- a/scripts/generate-assets.sh +++ b/scripts/generate-assets.sh @@ -1,16 +1,9 @@ #!/bin/bash -if [[ -z $1 ]] ; then - echo "Usage: $0 [FILE]" - exit 0 -else - FILENAME=$1 -fi +SVGTABLE="assets/all-assets.svg" +IDPRFX="EXP-" -PREFIX=EXP- - -for ID in `grep -o "id=\"$PREFIX.*\"" $FILENAME | cut -d\" -f2` ; do - OUTPUT=${ID#$PREFIX}.png - echo "Exporting area $ID to $OUTPUT..." - inkscape --export-id=$ID --export-png=$OUTPUT --file=$FILENAME +for ID in $(sed -n 's/.*id="\('"$IDPRFX"'[^"]\+\)".*/\1/p' $SVGTABLE); do + echo "Generating 'assets/${ID#$IDPRFX}.png' ..." + inkscape --without-gui --export-id=$ID --export-png=assets/${ID#$IDPRFX}.png $SVGTABLE done