[neon/snap-packaging/snapcraft-desktop-integration/work.core24] common: disable xdg update
Scarlett Moore
null at kde.org
Thu Jul 2 17:07:37 BST 2026
Git commit 092c9383ad80c1500ac589922d0ea906cb71d573 by Scarlett Moore.
Committed on 02/07/2026 at 16:07.
Pushed by scarlettmoore into branch 'work.core24'.
disable xdg update
M +31 -31 common/desktop-exports
https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration/-/commit/092c9383ad80c1500ac589922d0ea906cb71d573
diff --git a/common/desktop-exports b/common/desktop-exports
index b454ed4..4785226 100644
--- a/common/desktop-exports
+++ b/common/desktop-exports
@@ -230,37 +230,37 @@ for ((i = 0; i < ${#XDG_SPECIAL_DIRS_PATHS[@]}; i++)); do
fi
done
-# If needs XDG update and xdg-user-dirs-update exists in $PATH, run it
-if [ "$needs_xdg_update" = true ] && command -v xdg-user-dirs-update >/dev/null; then
- xdg-user-dirs-update
- 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
-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
- old="${XDG_SPECIAL_DIRS_INITIAL_PATHS[$i]}"
- new="${XDG_SPECIAL_DIRS_PATHS[$i]}"
- if [ -L "$old" ] && [ -d "$new" ] && [ "$(readlink "$old" 2>/dev/null)" != "$new" ] &&
- (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
- mv -vn "$old"/* "$new"/ 2>/dev/null
- elif [ -d "$old" ] && [ -d "$new" ] && [ "$old" != "$new" ] &&
- (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
- mv -vn "$old"/* "$new"/ 2>/dev/null
- fi
- done
-fi
+# # If needs XDG update and xdg-user-dirs-update exists in $PATH, run it
+# if [ "$needs_xdg_update" = true ] && command -v xdg-user-dirs-update >/dev/null; then
+# xdg-user-dirs-update
+# 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
+# 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
+# old="${XDG_SPECIAL_DIRS_INITIAL_PATHS[$i]}"
+# new="${XDG_SPECIAL_DIRS_PATHS[$i]}"
+# if [ -L "$old" ] && [ -d "$new" ] && [ "$(readlink "$old" 2>/dev/null)" != "$new" ] &&
+# (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
+# mv -vn "$old"/* "$new"/ 2>/dev/null
+# elif [ -d "$old" ] && [ -d "$new" ] && [ "$old" != "$new" ] &&
+# (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
+# mv -vn "$old"/* "$new"/ 2>/dev/null
+# fi
+# done
+# fi
# If detect wayland server socket, then set environment so applications prefer
# wayland, and setup compat symlink (until we use user mounts. Remember,
More information about the Neon-commits
mailing list