Skip to content

Commit 4d010b5

Browse files
committed
Updating links and adding install-v2.sh
1 parent 9f2b105 commit 4d010b5

8 files changed

Lines changed: 80 additions & 15 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def bootstrap = { String node ->
3434
}
3535

3636
// Disabling until we have a more sustainable Windows Jenkins Agent plan
37-
// See https://github.com/deisthree/jenkins-jobs/issues/351
37+
// See https://github.com/deis/jenkins-jobs/issues/351
3838
// node(windows) {
3939
// def gopath = pwd() + "\\gopath"
4040
// env.GOPATH = gopath

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Download Links:
2222

2323
`deis` is a command line utility used to interact with the [Deis](http://deis.io) open source PaaS.
2424

25-
Please add any [issues](https://github.com/deisthree/workflow-cli/issues) you find with this software to the [Deis Workflow CLI Project](https://github.com/deisthree/workflow-cli).
25+
Please add any [issues](https://github.com/teamhephy/workflow-cli/issues) you find with this software to the [Deis Workflow CLI Project](https://github.com/teamhephy/workflow-cli).
2626

2727
## Installation
2828

@@ -154,6 +154,6 @@ To learn more about a command run `deis help <command>`.
154154

155155
## License
156156

157-
see [LICENSE](https://github.com/deisthree/workflow-cli/blob/master/LICENSE)
157+
see [LICENSE](https://github.com/teamhephy/workflow-cli/blob/master/LICENSE)
158158

159-
[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0
159+
[v2.18]: https://github.com/teamhephy/workflow/releases/tag/v2.18.0

cmd/labels.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func parseLabel(label string) (string, string, error) {
125125

126126
if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
127127
return "", "", fmt.Errorf(`%s is invalid, Must be in format key=value
128-
Examples: git_repo=https://github.com/deisthree/workflow team=frontend`, label)
128+
Examples: git_repo=https://github.com/teamhephy/workflow team=frontend`, label)
129129
}
130130

131131
return parts[0], parts[1], nil

cmd/labels_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestLabelsList(t *testing.T) {
2727
fmt.Fprintf(w, `{
2828
"owner": "jim",
2929
"app": "rivendell",
30-
"label": {"team" : "deis", "git_repo": "https://github.com/deisthree/controller-sdk-go"},
30+
"label": {"team" : "teamhephy", "git_repo": "https://github.com/teamhephy/controller-sdk-go"},
3131
"created": "2014-01-01T00:00:00UTC",
3232
"updated": "2014-01-01T00:00:00UTC",
3333
"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
@@ -37,8 +37,8 @@ func TestLabelsList(t *testing.T) {
3737
err = cmdr.LabelsList("rivendell")
3838
assert.NoErr(t, err)
3939
assert.Equal(t, strings.TrimSpace(b.String()), `=== rivendell Label
40-
git_repo: https://github.com/deisthree/controller-sdk-go
41-
team: deis`, "output")
40+
git_repo: https://github.com/teamhephy/controller-sdk-go
41+
team: teamhephy`, "output")
4242

4343
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
4444
testutil.SetHeaders(w)
@@ -70,16 +70,16 @@ func TestListsSet(t *testing.T) {
7070
server.Mux.HandleFunc("/v2/apps/lothlorien/settings/", func(w http.ResponseWriter, r *http.Request) {
7171
testutil.SetHeaders(w)
7272
data := map[string]interface{}{
73-
"git_repo": "https://github.com/deisthree/controller-sdk-go",
74-
"team": "deis",
73+
"git_repo": "https://github.com/teamhephy/controller-sdk-go",
74+
"team": "teamhephy",
7575
}
7676
testutil.AssertBody(t, api.AppSettings{Label: data}, r)
7777
fmt.Fprintf(w, "{}")
7878
})
7979

8080
err = cmdr.LabelsSet("lothlorien", []string{
81-
"team=deis",
82-
"git_repo=https://github.com/deisthree/controller-sdk-go",
81+
"team=teamhephy",
82+
"git_repo=https://github.com/teamhephy/controller-sdk-go",
8383
})
8484
assert.NoErr(t, err)
8585
assert.Equal(t, testutil.StripProgress(b.String()), "Applying labels on lothlorien... done\n", "output")

install-v2.sh

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#!/usr/bin/env sh
2+
3+
# Invoking this script:
4+
#
5+
# To install the latest stable version:
6+
# curl https://deis.io/deis-cli/install-v2.sh | sh
7+
#
8+
# To install a specific released version ($VERSION):
9+
# curl https://deis.io/deis-cli/install-v2.sh | sh -s $VERSION
10+
#
11+
# - download deis cli binary
12+
# - making sure deis cli binary is executable
13+
# - explain what was done
14+
#
15+
16+
# install current version unless overridden by first command-line argument
17+
VERSION=${1:-stable}
18+
19+
set -euf
20+
21+
check_platform_arch() {
22+
local supported="linux-amd64 darwin-amd64"
23+
24+
if ! echo "${supported}" | tr ' ' '\n' | grep -q "${PLATFORM}-${ARCH}"; then
25+
cat <<EOF
26+
27+
The Deis Workflow CLI (deis) is not currently supported on ${PLATFORM}-${ARCH}.
28+
29+
See https://deis.com/workflow/ for more information.
30+
31+
EOF
32+
fi
33+
}
34+
35+
PLATFORM="$(uname | tr '[:upper:]' '[:lower:]')"
36+
ARCH="$(uname -m)"
37+
# https://storage.googleapis.com/workflow-cli-release/v2.0.0/deis-v2.0.0-darwin-386
38+
DEIS_BIN_URL_BASE="https://storage.googleapis.com/workflow-cli-release"
39+
40+
if [ "${ARCH}" = "x86_64" ]; then
41+
ARCH="amd64"
42+
fi
43+
44+
check_platform_arch
45+
46+
DEIS_CLI="deis-${VERSION}-${PLATFORM}-${ARCH}"
47+
DEIS_CLI_PATH="${DEIS_CLI}"
48+
if [ "${VERSION}" != 'stable' ]; then
49+
DEIS_CLI_PATH="${VERSION}/${DEIS_CLI_PATH}"
50+
fi
51+
52+
echo "Downloading ${DEIS_CLI} From Google Cloud Storage..."
53+
curl -fsSL -o deis "${DEIS_BIN_URL_BASE}/${DEIS_CLI_PATH}"
54+
55+
chmod +x deis
56+
57+
cat <<EOF
58+
59+
The Deis Workflow CLI (deis) is now available in your current directory.
60+
61+
To learn more about Deis Workflow, execute:
62+
63+
$ ./deis --help
64+
65+
EOF

parser/labels.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Usage: deis labels:set [options] <key>=<value>...
7070
7171
Arguments:
7272
<key> the label key, for example: "git_repo" or "team"
73-
<value> the label value, for example: "https://github.com/deisthree/workflow" or "frontend"
73+
<value> the label value, for example: "https://github.com/teamhephy/workflow" or "frontend"
7474
7575
Options:
7676
-a --app=<app>

parser/labels_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestLabels(t *testing.T) {
4646
expected: "",
4747
},
4848
{
49-
args: []string{"labels:set", "git_repo=https://github.com/deisthree/workflow", "team=deis"},
49+
args: []string{"labels:set", "git_repo=https://github.com/teamhephy/workflow", "team=deis"},
5050
expected: "",
5151
},
5252
{

pkg/logging/log_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestPrintLogs(t *testing.T) {
3636
PrintLog(&b, "INFO [test]: testing")
3737
assert.Equal(t, b.String(), "\033[35mINFO [test]: testing\033[0m\n", "log line")
3838
b.Reset()
39-
// Regression test for https://github.com/deisthree/deis/issues/4420
39+
// Regression test for https://github.com/deis/deis/issues/4420
4040
PrintLog(&b, "\nDone preparing production files\n\n\u001b[4mRunning \"concat:plugins\" (concat) task\u001b[24m\n")
4141
assert.Equal(t, b.String(),
4242
"\033[31m\nDone preparing production files\n\n\u001b[4mRunning \"concat:plugins\" (concat) task\u001b[24m\n\033[0m\n", "log line")

0 commit comments

Comments
 (0)