Commit 92c53a77 authored by Amos Wenger's avatar Amos Wenger

PerformElevatedSetup is contextual, not part of fuji settings

parent a62b9a7c
Pipeline #10377 passed with stage
in 52 seconds
......@@ -2,14 +2,10 @@ package fuji
import "github.com/itchio/wharf/state"
type PerformElevatedSetupFunc func() error
type Settings struct {
// CredentialsRegistryKey is the path of a key under HKEY_CURRENT_USER
// itch uses `SOFTWARE\itch\Sandbox`.
CredentialsRegistryKey string
PerformElevatedSetup PerformElevatedSetupFunc
}
type Credentials struct {
......
......@@ -42,7 +42,7 @@ func (wr *fujiRunner) Prepare() error {
if err != nil {
consumer.Warnf("Sandbox check failed: %s", err.Error())
err := fi.Settings().PerformElevatedSetup()
err := wr.params.FujiParams.PerformElevatedSetup()
if err != nil {
return err
}
......
......@@ -41,7 +41,8 @@ type FirejailParams struct {
}
type FujiParams struct {
Instance fuji.Instance
Instance fuji.Instance
PerformElevatedSetup func() error
}
type AttachParams struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment