From 9fa39a975cc46249986ab9b6836e1840ed111670 Mon Sep 17 00:00:00 2001
From: Andri Joos <andri@joos.io>
Date: Mon, 25 Nov 2024 23:00:46 +0100
Subject: [PATCH] add relative meta and gui dir
---
linux/snap.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/linux/snap.gitlab-ci.yml b/linux/snap.gitlab-ci.yml
index 11617af..9e99282 100644
--- a/linux/snap.gitlab-ci.yml
+++ b/linux/snap.gitlab-ci.yml
@@ -41,11 +41,13 @@ variables:
sed -i "s/\${GRADE}/${SNAP_GRADE}/" ${SNAP_CONFIG}
sed -i "s/\${COMMAND}/${SNAP_COMMAND}/" ${SNAP_CONFIG}
- META_DIR="${BUILD_DIR}/meta"
+ META_RELATIVE_DIR="meta"
+ META_DIR="${BUILD_DIR}/${META_RELATIVE_DIR}"
mkdir -p "${META_DIR}"
cp -r ${APP_DIR}/* ${BUILD_DIR}
cp "${SNAP_CONFIG}" "${META_DIR}/snap.yaml"
+ GUI_RELATIVE_DIR="${META_RELATIVE_DIR}/gui"
GUI_DIR="${META_DIR}/gui"
mkdir -p "${GUI_DIR}"
if [ "${SNAP_DESKTOP_FILE}" != "" ]
@@ -53,7 +55,7 @@ variables:
sed -i "s|\${NAME}|${APP_NAME}|" ${SNAP_DESKTOP_FILE}
sed -i "s/\${COMMENT}/${APP_SUMMARY}/" ${SNAP_DESKTOP_FILE}
sed -i "s/\${COMMAND}/${APP_NAME}/" ${SNAP_DESKTOP_FILE}
- sed -i "s|\${GUI_DIR}|\${SNAP}/${GUI_DIR}|" ${SNAP_DESKTOP_FILE}
+ sed -i "s|\${GUI_DIR}|\${SNAP}/${GUI_RELATIVE_DIR}|" ${SNAP_DESKTOP_FILE}
cp "${SNAP_DESKTOP_FILE}" "${GUI_DIR}/${APP_NAME}.desktop"
fi
--
GitLab