Skip to content
This repository was archived by the owner on Nov 5, 2019. It is now read-only.

Commit 599445f

Browse files
committed
woops, need to fix pathing in containers
1 parent 49351d3 commit 599445f

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ ADD . /go/src/github.com/archivers-space/coverage
1515
RUN go install github.com/archivers-space/coverage
1616
# Set binary as entrypoint
1717
ENTRYPOINT /go/bin/coverage
18-
19-
20-

coverage/coverage.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package coverage
22

33
import (
4-
"fmt"
54
"github.com/archivers-space/archive"
65
"github.com/archivers-space/coverage/repositories"
76
"github.com/archivers-space/coverage/tree"
@@ -134,12 +133,11 @@ func (c CoverageGenerator) Tree() (*tree.Node, error) {
134133
// t.Id = c.Sources[0].Id
135134
// }
136135

137-
fmt.Println(c.Repos)
138-
139136
for _, s := range c.Repos {
140137
if err := s.AddUrls(t, c.Sources...); err != nil {
141138
// log.Info(s.Info()["Name"])
142139
// log.Info(err.Error())
140+
return nil, err
143141
}
144142

145143
s.AddCoverage(t)

repositories/archivers2/archivers2.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/archivers-space/coverage/tree"
88
"net/url"
99
"os"
10+
"path/filepath"
1011
"strings"
1112
)
1213

@@ -46,7 +47,7 @@ func (a *repository) AddCoverage(t *tree.Node) {
4647
}
4748

4849
func (a *repository) AddUrls(t *tree.Node, sources ...*archive.Source) error {
49-
f, err := os.Open("repositories/archivers2/archivers_2_downloaded_epa_content_urls.txt")
50+
f, err := os.Open(filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", "repositories/archivers2/archivers_2_downloaded_epa_content_urls.txt"))
5051
if err != nil {
5152
return err
5253
}

repositories/archivers_space/archivers_space.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"github.com/archivers-space/coverage/tree"
88
"io/ioutil"
99
"net/url"
10+
"os"
11+
"path/filepath"
1012
"strings"
1113
)
1214

@@ -29,7 +31,7 @@ func (r *repository) DataRepo() *archive.DataRepo {
2931
}
3032

3133
func (s *repository) AddUrls(t *tree.Node, sources ...*archive.Source) error {
32-
rawData, err := ioutil.ReadFile("repositories/archivers_space/archivers.space_urls.json")
34+
rawData, err := ioutil.ReadFile(filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", "repositories/archivers_space/archivers.space_urls.json"))
3335
if err != nil {
3436
return err
3537
}

repositories/eot/eot.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"github.com/archivers-space/coverage/tree"
88
"io/ioutil"
99
"net/url"
10+
"os"
11+
"path/filepath"
1012
"strings"
1113
)
1214

@@ -29,7 +31,7 @@ func (r *repository) DataRepo() *archive.DataRepo {
2931
}
3032

3133
func (s *repository) AddUrls(t *tree.Node, sources ...*archive.Source) error {
32-
rawData, err := ioutil.ReadFile("repositories/eot/nomination_tool_epa_primer_uncrawlables.json")
34+
rawData, err := ioutil.ReadFile(filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", "repositories/eot/nomination_tool_epa_primer_uncrawlables.json"))
3335
if err != nil {
3436
return err
3537
}

repositories/ia/ia.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"github.com/archivers-space/coverage/tree"
88
"io/ioutil"
99
"net/url"
10+
"os"
11+
"path/filepath"
1012
"strings"
1113
)
1214

@@ -41,7 +43,7 @@ func (s *repository) AddCompletions(t *tree.Node) {
4143
}
4244

4345
func (s *repository) AddUrls(t *tree.Node, sources ...*archive.Source) error {
44-
rawData, err := ioutil.ReadFile("repositories/ia/ia_urls.json")
46+
rawData, err := ioutil.ReadFile(filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", "repositories/ia/ia_urls.json"))
4547
if err != nil {
4648
return err
4749
}

repositories/svalbard/svalbard.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/archivers-space/coverage/tree"
88
"net/url"
99
"os"
10+
"path/filepath"
1011
"strings"
1112
)
1213

@@ -29,7 +30,7 @@ func (r *repository) DataRepo() *archive.DataRepo {
2930
}
3031

3132
func (s *repository) AddUrls(t *tree.Node, sources ...*archive.Source) error {
32-
f, err := os.Open("repositories/svalbard/svalbard_urls.txt")
33+
f, err := os.Open(filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", "repositories/svalbard/svalbard_urls.txt"))
3334
if err != nil {
3435
return err
3536
}

0 commit comments

Comments
 (0)