Skip to content

Commit 7c2c5db

Browse files
author
Gabriel Monroy
committed
fix(*): rename constant folder, go fmt
1 parent 558bfb0 commit 7c2c5db

5 files changed

Lines changed: 22 additions & 27 deletions

File tree

client/destroy.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ func (c *FleetClient) Destroy(target string) (err error) {
1111
return
1212
}
1313
if num == 0 {
14-
num, err = c.lastUnit(component)
15-
if err != nil {
16-
return err
17-
}
14+
num, err = c.lastUnit(component)
15+
if err != nil {
16+
return err
17+
}
1818
}
1919
unitName, err := formatUnitName(component, num)
2020
if err != nil {

constants/constants.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

deisctl.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package main
22

33
import (
44
"fmt"
5+
"os"
6+
"strconv"
7+
58
"github.com/deis/deisctl/client"
69
"github.com/deis/deisctl/cmd"
7-
"github.com/deis/deisctl/constants"
10+
"github.com/deis/deisctl/constant"
811
"github.com/deis/deisctl/updatectl"
912
"github.com/deis/deisctl/utils"
1013
docopt "github.com/docopt/docopt-go"
11-
"os"
12-
"strconv"
1314
)
1415

1516
func exit(err error, code int) {
@@ -36,11 +37,11 @@ func Update(args []string) {
3637
"--min-sleep=5",
3738
"--max-sleep=10",
3839
}
39-
if err := utils.Execute(constant.HooksDir + "pre-update.sh"); err != nil {
40+
if err := utils.Execute(constant.HooksDir + "pre-update"); err != nil {
4041
fmt.Println("pre-updatehook failed")
4142
}
4243
updatectl.Update(Args)
43-
if err := utils.Execute(constant.HooksDir + "post-update.sh"); err != nil {
44+
if err := utils.Execute(constant.HooksDir + "post-update"); err != nil {
4445
fmt.Println("post-updatehook failed")
4546
}
4647
}

updatectl/instance.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@ package updatectl
22

33
import (
44
"bytes"
5-
"code.google.com/p/go-uuid/uuid"
65
"encoding/xml"
76
"fmt"
8-
"github.com/coreos/go-omaha/omaha"
9-
update "github.com/coreos/updatectl/client/update/v1"
10-
"github.com/deis/deisctl/client"
11-
"github.com/deis/deisctl/cmd"
12-
"github.com/deis/deisctl/constants"
13-
"github.com/deis/deisctl/utils"
147
"io"
158
"log"
169
"math/rand"
@@ -19,6 +12,14 @@ import (
1912
"strings"
2013
"text/tabwriter"
2114
"time"
15+
16+
"code.google.com/p/go-uuid/uuid"
17+
"github.com/coreos/go-omaha/omaha"
18+
update "github.com/coreos/updatectl/client/update/v1"
19+
"github.com/deis/deisctl/client"
20+
"github.com/deis/deisctl/cmd"
21+
"github.com/deis/deisctl/constant"
22+
"github.com/deis/deisctl/utils"
2223
)
2324

2425
var (

utils/utils.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import (
66
_ "bufio"
77
"bytes"
88
"fmt"
9-
"github.com/deis/deisctl/constants"
10-
"github.com/docker/docker/api/client"
11-
"github.com/satori/go.uuid"
129
"io"
1310
"io/ioutil"
1411
"net"
@@ -19,6 +16,10 @@ import (
1916
"syscall"
2017
"testing"
2118
"time"
19+
20+
"github.com/deis/deisctl/constant"
21+
"github.com/docker/docker/api/client"
22+
uuid "github.com/satori/go.uuid"
2223
)
2324

2425
// NewUuid returns a new V4-style unique identifier.

0 commit comments

Comments
 (0)