alex/homemaker
1
Fork 0
Code Releases 1 Activity

Adopt changes required by upstream maintainer

Browse Source 
This commit switches indentation to tabs, rather than spaces, removes an
unnecessary conditional check and adopts the project naming convention.
It also updates the documentation to reflect the changes it creates.
This commit is contained in:
tridentlead 2017-01-04 23:38:21 -05:00
parent 66eb33b724
commit fc6740c07c
No known key found for this signature in database
GPG Key ID: CE37EAE1E94DA098
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -223,11 +223,12 @@ shown below:
Homemaker will process the dependency tasks before processing the task itself. Homemaker will process the dependency tasks before processing the task itself.
In addition to creating links, Homemaker is capable of executing commands on a per-task basis. Commands should be In addition to creating links, Homemaker is capable of executing commands on a per-task basis. Homemaker can commands both
defined in an array called `cmds`, split into an item per each command line argument. All of the commands are executed before and after linking your configuration. Commands should be placed in either an array, under the field `precmds` or
with `dest` as the working directory (as mentioned previously, this defaults to your home directory). If any command `postcmds` (for commands to be run before and after linking respectively). These commands should be split into an array of
returns a nonzero exit code, Homemaker will display an error message and prompt the user to determine if it should strings, with each entry corresponding to one command line argument. All of the commands are executed with `dest` as
*abort*, *retry*, or *cancel*. the working directory (as mentioned previously, this defaults to your home directory). If any command returns a nonzero
exit code, Homemaker will display an error message and prompt the user to determine if it should *abort*, *retry*, or *cancel*.
The example task below will clone and install configuration files for Vim into the `~/.config` directory, and create The example task below will clone and install configuration files for Vim into the `~/.config` directory, and create
links to it from the home directory. You may notice that this task references an environment variable (set by Homemaker links to it from the home directory. You may notice that this task references an environment variable (set by Homemaker

17
task.go
View File

@ -30,9 +30,9 @@ import (
type task struct { type task struct {
Deps []string Deps []string
Links [][]string Links [][]string
Precmds [][]string CmdsPre [][]string
Cmds [][]string Cmds [][]string
Postcmds [][]string CmdsPost [][]string
Envs [][]string Envs [][]string
Accepts [][]string Accepts [][]string
Rejects [][]string Rejects [][]string
@ -63,15 +63,12 @@ func (t *task) process(conf *config) error {
} }
} }
if conf.flags&flagNoCmds == 0 { if conf.flags&flagNoCmds == 0 {
for _, currCmd := range t.Precmds { for _, currCmd := range t.CmdsPre {
if err := processCmd(currCmd, true, conf); err != nil { if err := processCmd(currCmd, true, conf); err != nil {
return err return err
} }
} }
}
if conf.flags&flagNoCmds == 0 {
for _, currCmd := range t.Cmds { for _, currCmd := range t.Cmds {
if err := processCmd(currCmd, true, conf); err != nil { if err := processCmd(currCmd, true, conf); err != nil {
return err return err
@ -87,15 +84,15 @@ func (t *task) process(conf *config) error {
} }
} }
if conf.flags&flagNoCmds == 0 { if conf.flags&flagNoCmds == 0 {
for _, currCmd := range t.Postcmds { for _, currCmd := range t.CmdsPost {
if err := processCmd(currCmd, true, conf); err != nil { if err := processCmd(currCmd, true, conf); err != nil {
return err return err
} }
} }
} }
return nil return nil
} }
func (t *task) skippable(conf *config) bool { func (t *task) skippable(conf *config) bool {