Merge pull request #45 from infosiftr/single-line

Finally deprecate the legacy line-based format

Author: yosifkit

cmd/bashbrew/git.go

@@ -209,21 +209,16 @@ func (r Repo) fetchGitRepo(arch string, entry *manifest.Manifest2822Entry) (stri
 		}
 		defer os.RemoveAll(tempRefDir)
 
-		tempRef := path.Join(refBase, filepath.Base(tempRefDir))
-		if entry.ArchGitFetch(arch) == manifest.DefaultLineBasedFetch {
-			// backwards compat (see manifest/line-based.go in go-dockerlibrary)
-			fetchStrings[0] += tempRef + "/*"
-		} else {
-			fetchStrings[0] += tempRef + "/temp"
-		}
+		tempRef := path.Join(refBase, filepath.Base(tempRefDir)) + "/temp"
+		fetchStrings[0] += tempRef
 
 		fetchStrings = append([]string{
 			// Git (and more recently, GitHub) support "git fetch"ing a specific commit directly!
 			// (The "actions/checkout@v2" GitHub action uses this to fetch commits for running workflows even after branches are deleted!)
 			// https://github.com/git/git/commit/f8edeaa05d8623a9f6dad408237496c51101aad8
 			// https://github.com/go-git/go-git/pull/58
 			// If that works, we want to prefer it (since it'll be much more efficient at getting us the commit we care about), so we prepend it to our list of "things to try fetching"
-			entryArchGitCommit + ":" + tempRef + "/temp",
+			entryArchGitCommit + ":" + tempRef,
 		}, fetchStrings...)
 	}
 

manifest/example_test.go

@@ -83,23 +83,6 @@ s390x-File: Dockerfile
 	}
 	fmt.Printf("\n")
 
-	man, err = manifest.Parse(bufio.NewReader(strings.NewReader(`
-# maintainer: InfoSiftr <[email protected]> (@infosiftr)
-# maintainer: John Smith <[email protected]> (@example-jsmith)
-
-# first set
-a: b@c d
-e: b@c d
-
- # second set
-f: g@h
-i: g@h j
-`)))
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("-------------\nline-based:\n%v\n", man)
-
 	// Output:
 	// -------------
 	// 2822:
@@ -145,27 +128,6 @@ i: g@h j
 	//
 	//   - raspbian
 	//     - raspbian-s390x
-	//
-	// -------------
-	// line-based:
-	// Maintainers: InfoSiftr <[email protected]> (@infosiftr), John Smith <[email protected]> (@example-jsmith)
-	// GitFetch: refs/heads/*
-	//
-	// Tags: a, e
-	// GitRepo: b
-	// GitCommit: c
-	// Directory: d
-	//
-	// Tags: f
-	// GitRepo: g
-	// GitFetch: refs/tags/h
-	// GitCommit: FETCH_HEAD
-	//
-	// Tags: i
-	// GitRepo: g
-	// GitFetch: refs/tags/h
-	// GitCommit: FETCH_HEAD
-	// Directory: j
 }
 
 func ExampleFetch_local() {

manifest/line-based.go

@@ -581,6 +581,9 @@ func (decoder *decoderWrapper) Decode(entry *Manifest2822Entry) error {
 	}
 }
 
+// https://github.com/docker-library/bashbrew/issues/16
+var Parse = Parse2822
+
 func Parse2822(readerIn io.Reader) (*Manifest2822, error) {
 	reader := stripper.NewCommentStripper(readerIn)