Merge branch 'fix_snap'

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