Compare commits
2 Commits
693e61d7d4
...
2824ee4c62
Author | SHA1 | Date |
---|---|---|
AJ ONeal | 2824ee4c62 | |
AJ ONeal | e7a02191d8 |
|
@ -3,6 +3,7 @@ package manager
|
|||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
@ -121,7 +122,12 @@ func getSystemSrvs() ([]string, error) {
|
|||
}
|
||||
|
||||
func getUserSrvs(home string) ([]string, error) {
|
||||
return getSrvs(filepath.Join(home, srvUserPath))
|
||||
confDir := filepath.Join(home, srvUserPath)
|
||||
err := os.MkdirAll(confDir, 0755)
|
||||
if nil != err {
|
||||
return nil, err
|
||||
}
|
||||
return getSrvs(confDir)
|
||||
}
|
||||
|
||||
// "come.example.foo.plist" matches "foo"
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
package manager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestEmptyUserServicePath(t *testing.T) {
|
||||
srvs, err := getUserSrvs("/tmp/fakeuser")
|
||||
if nil != err {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(srvs) > 0 {
|
||||
t.Fatal(fmt.Errorf("sanity fail: shouldn't get services from empty directory"))
|
||||
}
|
||||
|
||||
dirs, err := ioutil.ReadDir(filepath.Join("/tmp/fakeuser", srvUserPath))
|
||||
if nil != err {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(dirs) > 0 {
|
||||
t.Fatal(fmt.Errorf("sanity fail: shouldn't get listing from empty directory"))
|
||||
}
|
||||
|
||||
err = os.RemoveAll("/tmp/fakeuser")
|
||||
if nil != err {
|
||||
panic("couldn't remove /tmp/fakeuser")
|
||||
}
|
||||
}
|
|
@ -230,7 +230,7 @@ func add() {
|
|||
}
|
||||
|
||||
if len(ass) > 0 {
|
||||
fmt.Println("OPTIONS: Making some assumptions...\n")
|
||||
fmt.Printf("OPTIONS: Making some assumptions...\n\n")
|
||||
for i := range ass {
|
||||
fmt.Println("\t" + ass[i])
|
||||
}
|
||||
|
@ -350,7 +350,7 @@ func list() {
|
|||
fmt.Fprintf(os.Stderr, "\n")
|
||||
}
|
||||
|
||||
fmt.Println("serviceman-managed services:\n")
|
||||
fmt.Printf("serviceman-managed services:\n\n")
|
||||
for i := range managed {
|
||||
fmt.Println("\t" + managed[i])
|
||||
}
|
||||
|
@ -360,7 +360,7 @@ func list() {
|
|||
fmt.Println("")
|
||||
|
||||
if verbose {
|
||||
fmt.Println("other services:\n")
|
||||
fmt.Printf("other services:\n\n")
|
||||
for i := range others {
|
||||
fmt.Println("\t" + others[i])
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue