Skip to content

fix: Desktop icons and GTK config files #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2025
Merged

fix: Desktop icons and GTK config files #451

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7be984
Fix desktop icons and GTK config files
ashuntu Aug 15, 2025
a977d0d
Remove old icon links
ashuntu Aug 18, 2025
58dd800
Remove stale icon linking
ashuntu Aug 18, 2025
e670407
Remove desktop exec tweak
ashuntu Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 50 additions & 19 deletions src/desktop-launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ else
needs_update=true
fi

# Set $REALHOME to the users real home directory
REALHOME=$(getent passwd $UID | cut -d ':' -f 6)

export SNAP_DESKTOP_RUNTIME=$SNAP

# Set config folder to local path
Expand All @@ -54,9 +51,9 @@ chmod 700 "$XDG_CONFIG_HOME"

# If the user has modified their user-dirs settings, force an update
if [[ -f "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum" ]]; then
if [[ "$(md5sum < "$REALHOME/.config/user-dirs.dirs")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum")" ||
if [[ "$(md5sum < "$SNAP_REAL_HOME/.config/user-dirs.dirs")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum")" ||
( -f "$XDG_CONFIG_HOME/user-dirs.locale.md5sum" &&
"$(md5sum < "$REALHOME/.config/user-dirs.locale")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.locale.md5sum")" ) ]]; then
"$(md5sum < "$SNAP_REAL_HOME/.config/user-dirs.locale")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.locale.md5sum")" ) ]]; then
needs_update=true
fi
else
Expand Down Expand Up @@ -326,22 +323,56 @@ if [ -n "$SNAP_DESKTOP_DEBUG" ]; then
echo "Now running: exec $*"
fi

# Fix default run command
# The default works on a system with only the Snap installed, but if they also
# have the deb then the default command will run the deb instead of the Snap.
find "$SNAP_USER_COMMON/.local/share/applications" -type f | while read -r file; do
sed -i "s/Exec=steam/Exec=snap run steam/" "$file"
done
######################################
# Adjustments to shortcuts and icons #
######################################

# Links game icons to host
find "$SNAP_USER_COMMON/.local/share/icons/hicolor" -type f -name "steam_icon_*.png" | while read -r file; do
dest="${file/$SNAP_USER_COMMON/$REALHOME}"
ensure_dir_exists "$(dirname $dest)"
ln -sf "$file" "$dest"
done
# Set what the desktop folder is and ensure that the folders applications and icons exist.
DESKTOP_PATH=$(grep "XDG_DESKTOP_DIR" $SNAP_REAL_HOME/.config/user-dirs.dirs | cut -d'=' -f2 | sed 's/"//g' | sed "s#\$HOME#$SNAP_REAL_HOME#g")
ensure_dir_exists $SNAP_REAL_HOME/.local/share/applications/
ensure_dir_exists $SNAP_REAL_HOME/.local/share/icons/

# Remove links from previous installs (https://github.com/canonical/steam-snap/pull/451)
find "$SNAP_REAL_HOME/.local/share/applications/" -type l -lname "$SNAP_USER_COMMON/.local/share/applications/*" -delete
find "$SNAP_REAL_HOME/.local/share/icons/hicolor/" -type l -lname "$SNAP_USER_COMMON/.local/share/icons/hicolor/*" -delete

# Copy .desktop of Desktop folder
if [ -d "$SNAP_USER_COMMON/Desktop" ] && [ ! -L "$SNAP_USER_COMMON/Desktop" ]; then
for file in "$SNAP_USER_COMMON/Desktop/"*.desktop; do
if [ -e "$file" ]; then
cp -f "$file" "$DESKTOP_PATH/"
fi
done
fi

# Link .desktop files to host
ln -sf $SNAP_USER_COMMON/.local/share/applications/* $REALHOME/.local/share/applications/
# Copy icons folder
if [ -d "$SNAP_USER_COMMON/.local/share/icons" ] && [ ! -L "$SNAP_USER_COMMON/.local/share/icons" ]; then
cp -rf "$SNAP_USER_COMMON/.local/share/icons" "$SNAP_REAL_HOME/.local/share/"
fi

# Copy applications folder
if [ -d "$SNAP_USER_COMMON/.local/share/applications" ] && [ ! -L "$SNAP_USER_COMMON/.local/share/applications" ]; then
cp -rf "$SNAP_USER_COMMON/.local/share/applications" "$SNAP_REAL_HOME/.local/share/"
fi

rm -r $SNAP_USER_COMMON/Desktop
rm -r $SNAP_USER_COMMON/.local/share/applications
rm -r $SNAP_USER_COMMON/.local/share/icons

ln -sf "$DESKTOP_PATH" "$SNAP_USER_COMMON/Desktop"
ln -sf $SNAP_REAL_HOME/.local/share/applications/ $SNAP_USER_COMMON/.local/share/applications
ln -sf $SNAP_REAL_HOME/.local/share/icons/ $SNAP_USER_COMMON/.local/share/icons

# GTK theme and behavior modifier
# Those can impact the theme engine used by Qt as well
gtk_configs=(gtk-4.0/settings.ini gtk-4.0/gtk.css gtk-4.0/bookmarks gtk-4.0/colors.css gtk-3.0/settings.ini gtk-3.0/gtk.css gtk-3.0/bookmarks gtk-3.0/colors.css gtk-2.0/gtkfilechooser.ini)
for f in "${gtk_configs[@]}"; do
dest="$XDG_CONFIG_HOME/$f"
if [ ! -L "$dest" ]; then
ensure_dir_exists "$(dirname "$dest")"
ln -s "$SNAP_REAL_HOME/.config/$f" "$dest"
fi
done

strip_unreachable_dirs XDG_DATA_DIRS
strip_unreachable_dirs XDG_CONFIG_DIRS
Expand Down