[neon/snap-packaging/snapcraft-desktop-integration/work.core24] command-chain: Fix hooks paths.
Scarlett Moore
null at kde.org
Mon Feb 17 13:11:27 GMT 2025
Git commit 44bfe759fde903bbc018d97d1b54c7eccf92312d by Scarlett Moore.
Committed on 17/02/2025 at 13:10.
Pushed by scarlettmoore into branch 'work.core24'.
Fix hooks paths.
M +15 -3 command-chain/hooks-configure-desktop
M +15 -3 command-chain/hooks-configure-fonts
https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration/-/commit/44bfe759fde903bbc018d97d1b54c7eccf92312d
diff --git a/command-chain/hooks-configure-desktop b/command-chain/hooks-configure-desktop
index 3431e6c..6c3ffb3 100644
--- a/command-chain/hooks-configure-desktop
+++ b/command-chain/hooks-configure-desktop
@@ -1,5 +1,17 @@
#!/bin/bash
-set -- "${SNAP}/kf6/command-chain/hooks-configure-fonts" "$@"
-# shellcheck source=/dev/null
-source "${SNAP}/snap/command-chain/run"
+if [ "$PLATFORM_PLUG" == "kf6-core24" ]
+then
+ set -- "${SNAP}/kf6/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+elif [ "$PLATFORM_PLUG" == "kde-qt6-core24" ]
+then
+ set -- "${SNAP}/qt6/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+else
+ set -- "${SNAP}/kf5/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+fi
diff --git a/command-chain/hooks-configure-fonts b/command-chain/hooks-configure-fonts
index cc3673f..6c3ffb3 100644
--- a/command-chain/hooks-configure-fonts
+++ b/command-chain/hooks-configure-fonts
@@ -1,5 +1,17 @@
#!/bin/bash
-set -- "${SNAP}/kf6-/command-chain/hooks-configure-fonts" "$@"
-# shellcheck source=/dev/null
-source "${SNAP}/snap/command-chain/run"
+if [ "$PLATFORM_PLUG" == "kf6-core24" ]
+then
+ set -- "${SNAP}/kf6/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+elif [ "$PLATFORM_PLUG" == "kde-qt6-core24" ]
+then
+ set -- "${SNAP}/qt6/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+else
+ set -- "${SNAP}/kf5/command-chain/hooks-configure-fonts" "$@"
+ # shellcheck source=/dev/null
+ source "${SNAP}/snap/command-chain/run"
+fi
More information about the Neon-commits
mailing list