added blacklisting for path and files in findBaseDir

Author: Roberto Sora

tools/download.go

@@ -319,7 +319,7 @@ func stringInSlice(str string, list []string) bool {
 	return false
 }
 
-func CommonPrefix(sep byte, paths []string) string {
+func commonPrefix(sep byte, paths []string) string {
 	// Handle special cases.
 	switch len(paths) {
 	case 0:
@@ -365,11 +365,27 @@ func CommonPrefix(sep byte, paths []string) string {
 	return string(c)
 }
 
+func removeStringFromSlice(s []string, r string) []string {
+	for i, v := range s {
+		if v == r {
+			return append(s[:i], s[i+1:]...)
+		}
+	}
+	return s
+}
+
 func findBaseDir(dirList []string) string {
 	if len(dirList) == 1 {
 		return filepath.Dir(dirList[0]) + "/"
 	}
-	commonBaseDir := CommonPrefix(os.PathSeparator, dirList)
+
+	// https://github.com/backdrop-ops/contrib/issues/55#issuecomment-73814500
+	dontdiff := []string{"pax_global_header"}
+	for _, v := range dontdiff {
+		dirList = removeStringFromSlice(dirList, v)
+	}
+
+	commonBaseDir := commonPrefix(os.PathSeparator, dirList)
 	if commonBaseDir != "" {
 		commonBaseDir = commonBaseDir + "/"
 	}

tools/download_test.go

@@ -14,6 +14,8 @@ func Test_findBaseDir(t *testing.T) {
 		{[]string{"bin/", "bin/bossac"}, "bin/"},
 		{[]string{"bin/", "bin/bossac", "example"}, ""},
 		{[]string{"avrdude/bin/avrdude", "avrdude/etc/avrdude.conf"}, "avrdude/"},
+		{[]string{"pax_global_header","bin/", "bin/bossac"}, "bin/"},
+
 	}
 	for _, tt := range cases {
 		t.Run(fmt.Sprintln(tt.dirList), func(t *testing.T) {