mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

snap: fix handling of nonexistent last_revision file

Browse Source 
Assuming /bin/sh is symlinked to bash, the handling of special builtin
'source' is slightly different between bash and bash-in-POSIX-mode (as a
result of being invoked through /bin/sh). Specifically errors in builtin
'source' cannot be masked with `|| true`. Compare

$ ls -l /bin/sh
lrwxrwxrwx 1 root root 4 Dec 11 11:00 /bin/sh -> bash
$ /bin/sh -c 'set -e ; source nofile || true; echo ok'
/bin/sh: line 1: source: nofile: file not found
$ /bin/bash -c 'set -e ; source nofile || true; echo ok'
/bin/bash: line 1: nofile: No such file or directory
ok

Thus ghostty from snap would not start at all when
$SNAP_USER_DATA/.last_revision does not exist causign the launcher
script to exit prematurely.

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
This commit is contained in:
Maciek Borzecki
2026-01-09 15:48:41 +01:00
parent 18535f04d1
commit 49768c6464
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
snap/local/launcher
View File

@@ -14,7 +14,14 @@ if [ -z "$XDG_DATA_HOME" ]; then
export XDG_DATA_HOME="$SNAP_REAL_HOME/.local/share"
fi
source "$SNAP_USER_DATA/.last_revision" 2>/dev/null || true
if [ -f "$SNAP_USER_DATA/.last_revision" ]; then
if ! source "$SNAP_USER_DATA/.last_revision" 2>/dev/null; then
# file exist but sourcing it fails, so it's likely
# not good anyway
rm -f "$SNAP_USER_DATA/.last_revision"
fi
fi
if [ "$LAST_REVISION" = "$SNAP_REVISION" ]; then
needs_update=false
else