From 411a6be993363823a3b71cd5c6eb6ce4d244bd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@semtech.com>
Date: Fri, 30 Aug 2024 13:41:05 +0200
Subject: [PATCH] Rename magick_prefix tools_prefix

---
 conf/systemd.service |  2 +-
 scripts/_common.sh   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 1a57b4b..6f17727 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -14,7 +14,7 @@ Environment=RAILS_ENV=production
 Environment=UNICORN_SIDEKIQS=1
 Environment=LD_PRELOAD=__LIBJEMALLOC__
 Environment=UNICORN_LISTENER=__INSTALL_DIR__/discourse/tmp/sockets/unicorn.sock
-Environment="__YNH_RUBY_LOAD_PATH__:__MAGICK_PREFIX__/bin"
+Environment="__YNH_RUBY_LOAD_PATH__:__TOOLS_PREFIX__/bin"
 ExecStart=__INSTALL_DIR__/discourse/bin/bundle exec unicorn --config config/unicorn.conf.rb -E production
 Restart=always
 RestartSec=10
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 66f538b..b201d92 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -59,17 +59,18 @@ check_memory_requirements_upgrade() {
     fi
 }
 
-magick_prefix="$install_dir/imagemagick"
-# See https://github.com/discourse/discourse_docker/blob/main/image/base/install-imagemagick
+tools_prefix="$install_dir/dependencies"
+
 install_imagemagick() {
+    # See https://github.com/discourse/discourse_docker/blob/main/image/base/install-imagemagick
     ynh_setup_source --source_id="imagemagickv7" --dest_dir="$install_dir/imagemagick_source"
-    mkdir -p "$magick_prefix"
-    chown -R "$app:$app" "$install_dir/imagemagick_source" "$magick_prefix"
+    mkdir -p "$tools_prefix"
+    chown -R "$app:$app" "$install_dir/imagemagick_source" "$tools_prefix"
 
     pushd "$install_dir/imagemagick_source"
-        ynh_exec_as "$app" CFLAGS="-O2 -I$magick_prefix/include -Wno-deprecated-declarations" \
+        ynh_exec_as "$app" CFLAGS="-O2 -I$tools_prefix/include -Wno-deprecated-declarations" \
             ./configure \
-            --prefix="$magick_prefix" \
+            --prefix="$tools_prefix" \
             --enable-static \
             --enable-bounds-checking \
             --enable-hdri \