Skip to content

Commit 4f86267

Browse files
authored
Merge pull request #14 from d4rkstar/main
Ops unable to install prereq when executed from npx
2 parents f5ad5a9 + 0cce178 commit 4f86267

4 files changed

Lines changed: 5 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Available tools:
162162
-jq
163163
-login
164164
-needupdate
165+
-opspath
165166
-plugin
166167
-random
167168
-remove

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func setupCmd(me string) (string, error) {
5454
return "", err
5555
}
5656
if fileInfo.Mode()&os.ModeSymlink != 0 {
57-
me, err = os.Readlink(me)
57+
me, err = filepath.EvalSymlinks(me)
5858
if err != nil {
5959
return "", err
6060
}

prepare_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func Example_locate() {
4343
func Example_download() {
4444
_ = os.Chdir(workDir)
4545
OpsBranch = "0.1.0"
46+
os.Setenv("OPS_BRANCH", OpsBranch)
4647
opsdir, _ := homedir.Expand("~/.ops")
4748
_ = RemoveAll(opsdir)
4849
_, _ = downloadTasksFromGitHub(true, true)

tests/help.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ setup() {
6161

6262
run ops -t
6363
assert_success
64-
assert_line --partial "OpenServerless Tasks:"
64+
assert_line --partial "OpenServerless Administration Tasks"
6565
refute_line "Usage of experiments:"
6666
run ops -tasks
67-
assert_line --partial "OpenWhisk Tasks:"
67+
assert_line --partial "OpenWhisk Tasks"
6868
refute_line "Usage of experiments:"
6969

7070
run ops -i

0 commit comments

Comments
 (0)