diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 94c4005..1929969 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -304,6 +304,9 @@ jobs:
repository: yuezk/gpgui
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }}
path: gpgui-source/gpgui
+ - name: Verify Linux desktop assets
+ if: matrix.os.arch == 'amd64' && matrix.libc.name == 'glibc'
+ run: gpgui-source/gp/scripts/verify-linux-desktop-assets.sh gpgui-source/gpgui
- name: Tarball
run: |
cd gpgui-source
diff --git a/Makefile b/Makefile
index 62290d3..b469300 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,7 @@ install:
install -Dm755 packaging/files/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
install -Dm644 packaging/files/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
+ install -Dm644 packaging/files/usr/share/applications/gpauth.desktop $(DESTDIR)/usr/share/applications/gpauth.desktop
install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
install -Dm644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
@@ -277,6 +278,7 @@ uninstall:
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
+ rm -f $(DESTDIR)/usr/share/applications/gpauth.desktop
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
diff --git a/apps/gpauth/tauri.conf.json b/apps/gpauth/tauri.conf.json
index f446cb7..596b819 100644
--- a/apps/gpauth/tauri.conf.json
+++ b/apps/gpauth/tauri.conf.json
@@ -6,11 +6,14 @@
"beforeBuildCommand": ""
},
"identifier": "com.yuezk.gpauth",
- "productName": "gpauth",
+ "productName": "GP Connect Login",
"app": {
"withGlobalTauri": false,
"security": {
"csp": null
}
+ },
+ "bundle": {
+ "icon": ["icons/icon.png"]
}
}
diff --git a/flake.nix b/flake.nix
index bce8c3f..e72e156 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,6 +97,9 @@
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
+ substituteInPlace $out/share/applications/gpauth.desktop \
+ --replace-fail /usr/bin/gpauth /run/current-system/sw/bin/gpauth
+
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice
@@ -110,6 +113,9 @@
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
+ substituteInPlace $out/share/applications/gpauth.desktop \
+ --replace-fail /usr/bin/gpauth /run/current-system/sw/bin/gpauth
+
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice
diff --git a/packaging/binary/Makefile.in b/packaging/binary/Makefile.in
index 07d9547..87dcc72 100644
--- a/packaging/binary/Makefile.in
+++ b/packaging/binary/Makefile.in
@@ -18,6 +18,7 @@ install:
install -Dm755 artifacts/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
install -Dm644 artifacts/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
+ install -Dm644 artifacts/usr/share/applications/gpauth.desktop $(DESTDIR)/usr/share/applications/gpauth.desktop
install -Dm644 artifacts/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
install -Dm644 artifacts/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
install -Dm644 artifacts/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
@@ -40,6 +41,7 @@ uninstall:
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
+ rm -f $(DESTDIR)/usr/share/applications/gpauth.desktop
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
diff --git a/packaging/files/usr/share/applications/gpauth.desktop b/packaging/files/usr/share/applications/gpauth.desktop
new file mode 100644
index 0000000..ea9b873
--- /dev/null
+++ b/packaging/files/usr/share/applications/gpauth.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GP Connect Login
+Comment=Authenticate GP Connect VPN connections
+NoDisplay=true
+Terminal=false
+TryExec=/usr/bin/gpauth
+Exec=/usr/bin/gpauth
+Icon=gpgui
+Categories=Network;
diff --git a/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png
index d7e9730..b31f37a 100644
Binary files a/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png differ
diff --git a/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
index 301c18a..d10cdd6 100644
Binary files a/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png differ
diff --git a/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png
index a29d98a..fcbd261 100644
Binary files a/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png differ
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg b/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg
index bccc611..9f0efa6 100644
--- a/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg
+++ b/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg
@@ -1,99 +1,51 @@
-
-
+
diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in
index 20a8128..b8273fb 100644
--- a/packaging/rpm/globalprotect-openconnect.spec.in
+++ b/packaging/rpm/globalprotect-openconnect.spec.in
@@ -65,6 +65,7 @@ make build
%{_libexecdir}/gpclient/vpnc-script
%{_libexecdir}/gpclient/hipreport.sh
%{_datadir}/applications/gpgui.desktop
+%{_datadir}/applications/gpauth.desktop
%{_datadir}/icons/hicolor/32x32/apps/gpgui.png
%{_datadir}/icons/hicolor/128x128/apps/gpgui.png
%{_datadir}/icons/hicolor/256x256@2/apps/gpgui.png
diff --git a/scripts/verify-linux-desktop-assets.sh b/scripts/verify-linux-desktop-assets.sh
new file mode 100755
index 0000000..fea0cc4
--- /dev/null
+++ b/scripts/verify-linux-desktop-assets.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [[ $# -ne 1 ]]; then
+ echo "Usage: $0 " >&2
+ exit 1
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+GP_DIR="$(dirname "$SCRIPT_DIR")"
+GPGUI_DIR="$1"
+
+verify_same_file() {
+ local source_file="$1"
+ local packaged_file="$2"
+
+ if ! cmp --silent "$source_file" "$packaged_file"; then
+ echo "Linux desktop asset is out of sync: $packaged_file" >&2
+ echo "Expected it to match: $source_file" >&2
+ exit 1
+ fi
+}
+
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/32x32.png" \
+ "$GP_DIR/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/128x128.png" \
+ "$GP_DIR/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/128x128@2x.png" \
+ "$GP_DIR/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/icon.svg" \
+ "$GP_DIR/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/32x32.png" \
+ "$GP_DIR/apps/gpauth/icons/32x32.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/128x128.png" \
+ "$GP_DIR/apps/gpauth/icons/128x128.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/128x128@2x.png" \
+ "$GP_DIR/apps/gpauth/icons/128x128@2x.png"
+verify_same_file \
+ "$GPGUI_DIR/app/src-tauri/icons/icon.png" \
+ "$GP_DIR/apps/gpauth/icons/icon.png"
+verify_same_file \
+ "$GPGUI_DIR/app/gpauth.desktop" \
+ "$GP_DIR/packaging/files/usr/share/applications/gpauth.desktop"
+
+echo "Linux desktop assets are synchronized"