Merge pull request #355 from patviafore-kudzera/main

Restore Snap Support pt 4.
dannagle · Jan 12, 2024 · 0acc4a8 · 0acc4a8
2 parents d2577ed + e25899f
commit 0acc4a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -38,9 +38,10 @@ parts:
     source-branch: master
     cmake-parameters:
       - $SNAPCRAFT_PART_SRC/src
-    override-pull: |
-      craftctl default
+    override-build: |
       cp $SNAPCRAFT_PART_SRC/src/snap/CMakeLists.txt $SNAPCRAFT_PART_SRC/src/CMakeLists.txt
+      craftctl default
+
     build-packages:
       - build-essential
       - qt6-base-dev

diff --git a/src/snap/CMakeLists.txt b/src/snap/CMakeLists.txt
@@ -95,7 +95,7 @@ qt_add_executable(packetsender
     ${SOURCES} ${HEADERS} ${FORMS} ${RESOURCES} ${CSS}
 )
 
-execute_process(COMMAND git -C  $SNAPCRAFT_PART_SRC/src rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHA COMMAND_ERROR_IS_FATAL ANY OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND git -C  ${PROJECT_SOURCE_DIR} rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHA COMMAND_ERROR_IS_FATAL ANY OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 target_compile_definitions(packetsender PRIVATE
     GUI_BUILD