summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/commands.go7
-rw-r--r--pkg/files.go9
-rw-r--r--pkg/packages.go7
-rw-r--r--pkg/promises.go5
4 files changed, 20 insertions, 8 deletions
diff --git a/pkg/commands.go b/pkg/commands.go
index 4222de7..e3f6242 100644
--- a/pkg/commands.go
+++ b/pkg/commands.go
@@ -23,7 +23,7 @@ func CommandWithEnv(env []string, cmd string, args ...string) *CommandPromise {
cmd: cmd,
env: env,
err: nil,
- status: PROMISED,
+ status: DECLARED,
}
}
@@ -44,7 +44,10 @@ func (c *CommandPromise) IfRepaired(p ...Promise) Promise {
}
func (c *CommandPromise) Promise() *CommandPromise {
- commands = append(commands, c)
+ if c.status == DECLARED {
+ c.status = PROMISED
+ commands = append(commands, c)
+ }
return c
}
diff --git a/pkg/files.go b/pkg/files.go
index 6f22176..ac63718 100644
--- a/pkg/files.go
+++ b/pkg/files.go
@@ -45,7 +45,7 @@ func Directory(filename any) *FilePromise {
filename: interfaceToTemplateValue(filename),
fileType: DIRECTORY,
permissions: nil,
- status: PROMISED,
+ status: DECLARED,
}
}
@@ -58,7 +58,7 @@ func File(filename any) *FilePromise {
filename: interfaceToTemplateValue(filename),
fileType: FILE,
permissions: nil,
- status: PROMISED,
+ status: DECLARED,
}
}
@@ -88,7 +88,10 @@ func (f *FilePromise) IfRepaired(p ...Promise) Promise {
}
func (f *FilePromise) Promise() *FilePromise {
- files = append(files, f)
+ if f.status == DECLARED {
+ f.status = PROMISED
+ files = append(files, f)
+ }
return f
}
diff --git a/pkg/packages.go b/pkg/packages.go
index 7ed8584..dea8f7c 100644
--- a/pkg/packages.go
+++ b/pkg/packages.go
@@ -19,7 +19,7 @@ func Package(names ...string) *PackagePromise {
chain: nil,
err: nil,
names: names,
- status: PROMISED,
+ status: DECLARED,
}
}
@@ -36,7 +36,10 @@ func (p *PackagePromise) IfRepaired(ps ...Promise) Promise {
}
func (p *PackagePromise) Promise() *PackagePromise {
- packages = append(packages, p)
+ if p.status == DECLARED {
+ p.status = PROMISED
+ packages = append(packages, p)
+ }
return p
}
diff --git a/pkg/promises.go b/pkg/promises.go
index 0198296..340f35d 100644
--- a/pkg/promises.go
+++ b/pkg/promises.go
@@ -9,7 +9,8 @@ type Promise interface {
type Status int
const (
- PROMISED = iota
+ DECLARED = iota
+ PROMISED
BROKEN
KEPT
REPAIRED
@@ -17,6 +18,8 @@ const (
func (s Status) String() string {
switch s {
+ case DECLARED:
+ return "declared"
case PROMISED:
return "promised"
case BROKEN: