fix: restore GUI callback desktop handler

This commit is contained in:
Kevin Yue committed 2026-08-07 17:11:29 +08:00
1 parent c92bdaed1d
commit 581710a770
12 files changed
+202 -45

No files matched your search

+19 -7
View File
@@ -98,9 +98,6 @@
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/share/applications/gpauth.desktop \
--replace-fail /usr/bin/gpauth $out/bin/gpauth
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice \
--replace-fail /usr/libexec/gpclient/gp-vpnc-script-installer $out/bin/gp-vpnc-script-installer
@@ -115,9 +112,6 @@
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/share/applications/gpauth.desktop \
--replace-fail /usr/bin/gpauth $out/bin/gpauth
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice \
--replace-fail /usr/libexec/gpclient/gp-vpnc-script-installer ${prebuiltFiles}/libexec/gpclient/gp-vpnc-script-installer
@@ -342,16 +336,25 @@
gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient'
gpservice_public='@gpservice_public@'
gpauth_public='@gpauth_public@'
if [ "''${1:-}" = "launch-gui" ]; then
shift
minimized=
callback=
for arg in "$@"; do
case "$arg" in
--minimized)
minimized=--minimized
;;
globalprotectcallback:*)
if [ -n "$callback" ]; then
echo "Multiple authentication callback URLs were provided" >&2
exit 2
fi
callback=$arg
;;
*)
echo "Unsupported launch-gui argument: $arg" >&2
exit 2
@@ -359,6 +362,14 @@
esac
done
if [ -n "$callback" ]; then
if [ -n "$minimized" ]; then
echo "An authentication callback cannot be combined with --minimized" >&2
exit 2
fi
exec "$gpauth_public" auth-callback "$callback"
fi
if [ -n "''${XDG_DATA_HOME:-}" ]; then
data_home=$XDG_DATA_HOME
elif [ -n "''${HOME:-}" ]; then
@@ -395,7 +406,8 @@
exec "$gpclient_fhs" "$@"
EOF
substituteInPlace $out/bin/gpclient \
--replace-fail '@gpservice_public@' "$out/bin/gpservice"
--replace-fail '@gpservice_public@' "$out/bin/gpservice" \
--replace-fail '@gpauth_public@' "$out/bin/gpauth"
chmod +x $out/bin/gpclient
cat > $out/bin/gpservice <<'EOF'