Skip to content

Commit d749f68

Browse files
committed
fixes #143, fixes #144, bump selkies, fixes more input behavior on KDE, add helper for proot-apps installs from sidebar, reset modifiers on session close
1 parent d348358 commit d749f68

3 files changed

Lines changed: 29 additions & 4 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 72a11eeb1f0fd3ca4c17152c7b34b26cb6c8af5a
19+
git checkout -f d9f02e6de4626c759c38c7aafccf7d4d39b314bb
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -284,7 +284,7 @@ RUN \
284284
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
285285
curl -o \
286286
/tmp/selkies.tar.gz -L \
287-
"https://github.com/selkies-project/selkies/archive/72a11eeb1f0fd3ca4c17152c7b34b26cb6c8af5a.tar.gz" && \
287+
"https://github.com/selkies-project/selkies/archive/d9f02e6de4626c759c38c7aafccf7d4d39b314bb.tar.gz" && \
288288
cd /tmp && \
289289
tar xf selkies.tar.gz && \
290290
cd selkies-* && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 72a11eeb1f0fd3ca4c17152c7b34b26cb6c8af5a
19+
git checkout -f d9f02e6de4626c759c38c7aafccf7d4d39b314bb
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -282,7 +282,7 @@ RUN \
282282
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
283283
curl -o \
284284
/tmp/selkies.tar.gz -L \
285-
"https://github.com/selkies-project/selkies/archive/72a11eeb1f0fd3ca4c17152c7b34b26cb6c8af5a.tar.gz" && \
285+
"https://github.com/selkies-project/selkies/archive/d9f02e6de4626c759c38c7aafccf7d4d39b314bb.tar.gz" && \
286286
cd /tmp && \
287287
tar xf selkies.tar.gz && \
288288
cd selkies-* && \

root/selkies-proot

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
PROOT_APPS_BIN="$HOME/.local/bin/proot-apps"
4+
TARGET_WAYLAND_SOCKET=""
5+
6+
# Detect wayland socket
7+
if [ -n "$XDG_RUNTIME_DIR" ]; then
8+
for sock in "$XDG_RUNTIME_DIR"/wayland-*; do
9+
if [ -S "$sock" ]; then
10+
sock_name=$(basename "$sock")
11+
if [ "$sock_name" != "wayland-1" ]; then
12+
TARGET_WAYLAND_SOCKET="$sock_name"
13+
break
14+
fi
15+
fi
16+
done
17+
fi
18+
19+
# Launch terminal proot action
20+
if [ -n "$TARGET_WAYLAND_SOCKET" ]; then
21+
export WAYLAND_DISPLAY="$TARGET_WAYLAND_SOCKET"
22+
exec foot "$PROOT_APPS_BIN" "$@"
23+
else
24+
exec st "$PROOT_APPS_BIN" "$@"
25+
fi

0 commit comments

Comments
 (0)