From 8441c44f6267c392594fb9f83d3c565ce5d53ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com>
Date: Wed, 20 Sep 2023 15:19:04 +0200
Subject: [PATCH] fix: assets script for inkscape 1.3
---
.env.template | 2 +-
scripts/import-convert-assets.sh | 28 ++++++++++++++++------------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/.env.template b/.env.template
index 1771b0d..6eff757 100644
--- a/.env.template
+++ b/.env.template
@@ -5,7 +5,7 @@ ADMIN_ROLE=ADMINS
DEBUG_MODE
MOCK_OAUTH2
HTTPS_PORT
-IMAGE_FOLDER
+IMAGE_FOLDER=mnt/image-lib
# Needed to user OAuth2 authentication :
REDIRECT_URL
diff --git a/scripts/import-convert-assets.sh b/scripts/import-convert-assets.sh
index 75df08f..6ebfa51 100755
--- a/scripts/import-convert-assets.sh
+++ b/scripts/import-convert-assets.sh
@@ -11,25 +11,29 @@ REGISTRY_ID=409
EMAIL_ASSETS_PATH="src/assets/icons/email"
ECOGESTURE_ASSETS_PATH="src/assets/icons/visu/ecogesture"
+# Clear folder
+rm -rf ../$IMAGE_FOLDER
+
+# Create folder
+mkdir -p ../$IMAGE_FOLDER ../$IMAGE_FOLDER/ecogesture
+
# Fetch and convert email assets
curl "https://forge.grandlyon.com/api/v4/projects/${REGISTRY_ID}/repository/archive?path=${EMAIL_ASSETS_PATH}" --output email.tar.gz
tar -xf email.tar.gz
-cd *-email/$EMAIL_ASSETS_PATH && for file in *.svg; do inkscape -h 200 --export-type="png" $file; done && rm *.svg
+find *-email/$EMAIL_ASSETS_PATH -type f -name "*.svg" | while read -r svg_file; do
+ filename="$(basename "$svg_file" .svg)"
+ inkscape -h 200 -o ../$IMAGE_FOLDER/$filename.png *-email/$EMAIL_ASSETS_PATH/$filename.svg
+done
+rm *-email/$EMAIL_ASSETS_PATH/*.svg
-cd $WD
# Fetch and convert ecogesture assets
curl "https://forge.grandlyon.com/api/v4/projects/${REGISTRY_ID}/repository/archive?path=${ECOGESTURE_ASSETS_PATH}" --output ecogesture.tar.gz
tar -xf ecogesture.tar.gz
-cd *-ecogesture/$ECOGESTURE_ASSETS_PATH && for file in *.svg; do inkscape -h 200 --export-type="png" $file; done && rm *.svg
+find *-ecogesture/$ECOGESTURE_ASSETS_PATH -type f -name "*.svg" | while read -r svg_file; do
+ filename="$(basename "$svg_file" .svg)"
+ inkscape -h 200 -o ../$IMAGE_FOLDER/ecogesture/$filename.png *-ecogesture/$ECOGESTURE_ASSETS_PATH/$filename.svg
+done
+rm *-ecogesture/$ECOGESTURE_ASSETS_PATH/*.svg
# Cleanup
-cd $WD
-rm -rf ../$IMAGE_FOLDER
-
-# Create folder
-mkdir ../$IMAGE_FOLDER
-
-# Copy assets in IMAGE_FOLDER
-mv *-email/$EMAIL_ASSETS_PATH/* ../$IMAGE_FOLDER
-mv *-ecogesture/$ECOGESTURE_ASSETS_PATH ../$IMAGE_FOLDER/ecogesture
rm -rf email.tar.gz ecogesture.tar.gz *-email *-ecogesture
--
GitLab