security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 25 Wiki Activity

cmd/fpkg: compare all three store paths
All checks were successful
Tests / Go tests (push) Successful in 34s
Details
Nix / NixOS tests (push) Successful in 3m39s
Details

Browse Source 
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2024-12-29 17:10:41 +09:00
parent c795293f36
commit 891b3cbde7
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/fpkg/bundle.go
View File

@ -40,11 +40,11 @@ type bundleInfo struct {
// allow gpu access within sandbox // allow gpu access within sandbox
GPU bool `json:"gpu"` GPU bool `json:"gpu"`
// inner nix store path to activate-and-exec script // store path to activate-and-exec script
Launcher string `json:"launcher"` Launcher string `json:"launcher"`
// store path to /run/current-system // store path to /run/current-system
CurrentSystem string `json:"current_system"` CurrentSystem string `json:"current_system"`
// home-manager activation package // store path to home-manager activation package
ActivationPackage string `json:"activation_package"` ActivationPackage string `json:"activation_package"`
} }

4
cmd/fpkg/install.go
View File

@ -97,7 +97,9 @@ func actionInstall(args []string) {
if app != bundle { if app != bundle {
// do not try to re-install // do not try to re-install
if app.Launcher == bundle.Launcher { if app.CurrentSystem == bundle.CurrentSystem &&
app.Launcher == bundle.Launcher &&
app.ActivationPackage == bundle.ActivationPackage {
cleanup() cleanup()
fmsg.Printf("package %q is identical to local application %q", pkgPath, app.ID) fmsg.Printf("package %q is identical to local application %q", pkgPath, app.ID)
fmsg.Exit(0) fmsg.Exit(0)