From e478d85ee3347b067c81604860f722ad9d366d32 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Wed, 18 Nov 2026 10:35:19 +0100 Subject: [PATCH] Link the GitHub repository from the About pane - apple/package.sh: derive SOURCE_URL from REPO, next to the Sparkle feed URL, and substitute it into Info.plist. - apple/Info.plist: new SourceURL key holding the repository URL. - apple/Omnitun/SettingsView.swift: show a "Source Code on GitHub" link under the description when the key is present, so an unpackaged run shows none. - apple/Resources/fr.lproj/Localizable.strings: French label. Co-Authored-By: Claude Fable 5.2 --- apple/Info.plist | 3 +++ apple/Omnitun/SettingsView.swift | 9 +++++++++ apple/Resources/fr.lproj/Localizable.strings | 1 + apple/package.sh | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apple/Info.plist b/apple/Info.plist index be0f8fa..3abb114 100644 --- a/apple/Info.plist +++ b/apple/Info.plist @@ -21,6 +21,9 @@ BuildCommit @COMMIT@ + + SourceURL + @SOURCE_URL@ CFBundleDevelopmentRegion en diff --git a/apple/Omnitun/SettingsView.swift b/apple/Omnitun/SettingsView.swift index e2fafbe..81b64ac 100644 --- a/apple/Omnitun/SettingsView.swift +++ b/apple/Omnitun/SettingsView.swift @@ -37,6 +37,12 @@ private struct AboutView: View { return details.isEmpty ? short : "\(short) (\(details.joined(separator: ", ")))" } + /// The repository this build came from, set at packaging; absent when + /// the app runs unpackaged. + private var source: URL? { + (Bundle.main.infoDictionary?["SourceURL"] as? String).flatMap(URL.init(string:)) + } + var body: some View { VStack(spacing: 12) { Image(nsImage: NSApp.applicationIconImage).resizable().frame(width: 96, height: 96) @@ -44,6 +50,9 @@ private struct AboutView: View { Text(String(localized: "Version \(version)")).foregroundStyle(.secondary).textSelection(.enabled) Text("A VPN client for FortiGate SSL VPN, IPsec, OpenVPN, L2TP and WireGuard, several at a time.") .multilineTextAlignment(.center) + if let source { + Link("Source Code on GitHub", destination: source).font(.callout) + } Divider().frame(width: 300) Text(verbatim: "© 2026 GarageDeveloper and the \(brand.product) contributors") Text("Free software: use, change and share it under the MIT license or the Apache License 2.0, as you prefer.") diff --git a/apple/Resources/fr.lproj/Localizable.strings b/apple/Resources/fr.lproj/Localizable.strings index 8ebb795..58b830d 100644 --- a/apple/Resources/fr.lproj/Localizable.strings +++ b/apple/Resources/fr.lproj/Localizable.strings @@ -378,6 +378,7 @@ "Version %@" = "Version %@"; "A VPN client for FortiGate SSL VPN, IPsec, OpenVPN, L2TP and WireGuard, several at a time." = "Un client VPN pour le VPN SSL FortiGate, IPsec, OpenVPN, L2TP et WireGuard, plusieurs à la fois."; "Free software: use, change and share it under the MIT license or the Apache License 2.0, as you prefer." = "Logiciel libre : utilisez-le, modifiez-le et partagez-le selon la licence MIT ou la licence Apache 2.0, au choix."; +"Source Code on GitHub" = "Code source sur GitHub"; "MIT License" = "Licence MIT"; "Apache License 2.0" = "Licence Apache 2.0"; "OpenVPN or WireGuard File (.ovpn, .conf)…" = "Fichier OpenVPN ou WireGuard (.ovpn, .conf)…"; diff --git a/apple/package.sh b/apple/package.sh index f7e18ec..1b49364 100755 --- a/apple/package.sh +++ b/apple/package.sh @@ -39,6 +39,7 @@ if [ -n "$(git status --porcelain --untracked-files=no 2>/dev/null)" ]; then fi export OMNITUN_COMMIT="$COMMIT" REPO=${REPO:-GarageDeveloper/omnitun} +SOURCE_URL="https://github.com/$REPO" FEED_URL="https://github.com/$REPO/releases/latest/download/appcast.xml" dist=apple/dist @@ -84,7 +85,7 @@ subst() { sed -e "s|@PRODUCT@|$PRODUCT|g" -e "s|@ID@|$ID|g" -e "s|@RDNS@|$RDNS|g" -e "s|@DAEMON@|$DAEMON|g" -e "s|@CLI@|$CLI|g" \ -e "s|@ENGINE@|$ENGINE|g" -e "s|@ENGINE_USER@|$ENGINE_USER|g" \ -e "s|@LABEL@|$LABEL|g" -e "s|@BUNDLE_ID@|$BUNDLE_ID|g" -e "s|@VERSION@|$VERSION|g" -e "s|@BUILD@|$BUILD|g" \ - -e "s|@FEED_URL@|$FEED_URL|g" -e "s|@COMMIT@|$COMMIT|g" "$1" + -e "s|@FEED_URL@|$FEED_URL|g" -e "s|@SOURCE_URL@|$SOURCE_URL|g" -e "s|@COMMIT@|$COMMIT|g" "$1" } subst apple/Info.plist > "$app/Contents/Info.plist" cp -R apple/Resources/en.lproj apple/Resources/fr.lproj "$app/Contents/Resources/"