diff --git a/linux/snap.gitlab-ci.yml b/linux/snap.gitlab-ci.yml index fe36160928fd0dbb31fe4f905774c2419d9d2139..9e992820078cc5a9aac1a401a641ea0bb3e512c6 100644 --- a/linux/snap.gitlab-ci.yml +++ b/linux/snap.gitlab-ci.yml @@ -41,19 +41,21 @@ 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}" != "" ] then - sed -i "s|\${NAME}|${APP_NAME}/${GUI_DIR}|" ${SNAP_DESKTOP_FILE} + sed -i "s|\${NAME}|${APP_NAME}|" ${SNAP_DESKTOP_FILE} sed -i "s/\${COMMENT}/${APP_SUMMARY}/" ${SNAP_DESKTOP_FILE} - sed -i "s/\${COMMAND}/${SNAP_COMMAND}/" ${SNAP_DESKTOP_FILE} - sed -i "s|\${GUI_DIR}|\${SNAP}/${GUI_DIR}|" ${SNAP_DESKTOP_FILE} + sed -i "s/\${COMMAND}/${APP_NAME}/" ${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