jiri-v23-profiles: Use relative paths everywhere in profile manifests.
This CL:
* Gets rid of the SchemaVersion check when setting InstallationDir. We
now assume a schema version > 4.
* Uses relpath.RelativePath() for profile installation dirs. (Some were
using .String()).
* Uses relpath.String() for all environment variables. (Some were using
.Expand()).
* Minor fixes to RelativePath comments, and fix typo in signature.
MultiPart: 2/2
Change-Id: Ia877a2dd6e282024c8dc2a862fa0e24a3b407ea2
diff --git a/profiles/manager.go b/profiles/manager.go
index 65635ed..0681539 100644
--- a/profiles/manager.go
+++ b/profiles/manager.go
@@ -103,20 +103,19 @@
return RelativePath{name: name, value: value}
}
-// Join returns a copy of RelativePath with the specified components
-// appended to it using filepath.Join.
+// Join returns a copy of RelativePath with the specified components appended
+// to the path using filepath.Join.
func (rp RelativePath) Join(components ...string) RelativePath {
nrp := rp
nrp.path = filepath.Join(append([]string{nrp.path}, components...)...)
return nrp
}
-// RootJoin creates a new RelativePath that has the same variable
-// and associated value as its receiver and then appends components to it
-// using filepath.Join.
+// RootJoin returns a copy of RelativePath with the specified components
+// appended to the root using filepath.Join.
func (rp RelativePath) RootJoin(components ...string) RelativePath {
- nrp := RelativePath{name: rp.name, value: rp.value}
- nrp.path = filepath.Join(append([]string{nrp.path}, components...)...)
+ nrp := rp
+ nrp.path = filepath.Join(components...)
return nrp
}
@@ -127,7 +126,7 @@
// String returns the RelativePath with the root variable name as the
// root - i.e. ${name}[/<any append components>].
-func (rp *RelativePath) String() string {
+func (rp RelativePath) String() string {
root := "${" + rp.name + "}"
if len(rp.path) == 0 {
return root
