mirror of
https://github.com/DeeJanuz/frametop.git
synced 2026-10-06 01:00:06 +02:00
Take the user, host, and home from the machine, not this Frame
The local RDP login between krdp and the VNC bridge uses the account's own name instead of "steamos", its certificate the hostname instead of "steam-frame", and the ft_pointer driver installs under the user's home instead of /home/steamos. The remote-access address already came from the tailnet (tailscale0 and tailscaled's local API). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1f19732aaf
commit
d5c2ec65d7
3 files changed
+4
-4
No files matched your search
@@ -12,7 +12,7 @@ root=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
|
||||
. "$root/scripts/_env.sh"
|
||||
frame="$root/scripts/frame.sh"
|
||||
src=$FRAME_REPO/pointer/driver
|
||||
dest=/home/steamos/.local/share/frametop/ft_pointer
|
||||
dest='$HOME/.local/share/frametop/ft_pointer' # expanded on the Frame, in the commands below
|
||||
reg='/opt/steamvr/bin/linuxarm64/vrpathreg'
|
||||
|
||||
case ${1:-install} in
|
||||
|
||||
@@ -16,7 +16,7 @@ mkdir -p -m 0700 "$creds"
|
||||
# takes it only on its command line, which other local users can read while it runs.
|
||||
(umask 077; head -c 24 /dev/urandom | base64 | tr -d '/+=' | cut -c1-20 > "$creds/password")
|
||||
if [ ! -s "$creds/cert.pem" ]; then
|
||||
(umask 077; openssl req -x509 -newkey rsa:2048 -nodes -days 3650 -subj /CN=steam-frame \
|
||||
(umask 077; openssl req -x509 -newkey rsa:2048 -nodes -days 3650 -subj "/CN=$(hostname)" \
|
||||
-keyout "$creds/key.pem" -out "$creds/cert.pem" 2>/dev/null)
|
||||
fi
|
||||
|
||||
@@ -30,5 +30,5 @@ done
|
||||
export XDG_RUNTIME_DIR=/run/user/$(id -u)
|
||||
exec ~/.local/bin/distrobox enter dev -- env XDG_RUNTIME_DIR="$runtime" WAYLAND_DISPLAY=wayland-0 QT_QPA_PLATFORM=wayland \
|
||||
krdpserver --plasma --address 127.0.0.1 --port "$port" \
|
||||
-u steamos -p "$(cat "$creds/password")" \
|
||||
-u "$(id -un)" -p "$(cat "$creds/password")" \
|
||||
--certificate "$creds/cert.pem" --certificate-key "$creds/key.pem"
|
||||
@@ -75,7 +75,7 @@ while kill -0 $xvnc 2>/dev/null; do
|
||||
xrandr --addmode VNC-0 "$size" 2>/dev/null || true
|
||||
xrandr --fb "$size" --output VNC-0 --mode "$size"
|
||||
fi
|
||||
xfreerdp /v:127.0.0.1:"$rdp_port" /u:steamos /p:"$(cat "$creds/password")" \
|
||||
xfreerdp /v:127.0.0.1:"$rdp_port" /u:"$(id -un)" /p:"$(cat "$creds/password")" \
|
||||
/cert:ignore /size:"${ww}x${wh}" -decorations +clipboard >/dev/null 2>&1 &
|
||||
rdp=$!
|
||||
# FreeRDP takes no negative position, so move its window once it is up.
|
||||
|
||||
Reference in new issue
Block a user