[neon/snap-packaging/snapcraft-desktop-integration/work.core24] common: only comment the intrusive bit

Scarlett Moore null at kde.org
Sun Jul 5 10:02:16 BST 2026


Git commit ce292daa8f57f532fb9a33ef1587eb87434705e9 by Scarlett Moore.
Committed on 05/07/2026 at 09:01.
Pushed by scarlettmoore into branch 'work.core24'.

only comment the intrusive bit

M  +11   -11   common/desktop-exports

https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration/-/commit/ce292daa8f57f532fb9a33ef1587eb87434705e9

diff --git a/common/desktop-exports b/common/desktop-exports
index 4785226..04e3fda 100644
--- a/common/desktop-exports
+++ b/common/desktop-exports
@@ -236,17 +236,17 @@ done
 #   update_xdg_dirs_values
 # fi
 #
-# # Create links for user-dirs.dirs
-# if [ "$needs_xdg_links" = true ]; then
-#   if [ "$HOME" != "$SNAP_REAL_HOME" ]; then
-#     for ((i = 0; i < ${#XDG_SPECIAL_DIRS_PATHS[@]}; i++)); do
-#       b="$(realpath "${XDG_SPECIAL_DIRS_PATHS[$i]}" --relative-to="$HOME" 2>/dev/null)"
-#       if [[ -n "$b" && "$b" != "." && -e "$SNAP_REAL_HOME/$b" ]]; then
-#         [ -d "$HOME/$b" ] && rmdir "$HOME/$b" 2> /dev/null
-#         [ ! -e "$HOME/$b" ] && ln -s "$SNAP_REAL_HOME/$b" "$HOME/$b"
-#       fi
-#     done
-#   fi
+# Create links for user-dirs.dirs
+if [ "$needs_xdg_links" = true ]; then
+  if [ "$HOME" != "$SNAP_REAL_HOME" ]; then
+    for ((i = 0; i < ${#XDG_SPECIAL_DIRS_PATHS[@]}; i++)); do
+      b="$(realpath "${XDG_SPECIAL_DIRS_PATHS[$i]}" --relative-to="$HOME" 2>/dev/null)"
+      if [[ -n "$b" && "$b" != "." && -e "$SNAP_REAL_HOME/$b" ]]; then
+        [ -d "$HOME/$b" ] && rmdir "$HOME/$b" 2> /dev/null
+        [ ! -e "$HOME/$b" ] && ln -s "$SNAP_REAL_HOME/$b" "$HOME/$b"
+      fi
+    done
+  fi
 # else
 #   # If we aren't creating new links, check if we have content saved in old locations and move it
 #   for ((i = 0; i < ${#XDG_SPECIAL_DIRS[@]}; i++)); do


More information about the Neon-commits mailing list