fix: further import version detector

Author: calmh

_script/histver/synver.go

@@ -187,6 +187,10 @@ func getReleaseVersionTarGz(bs []byte) (tableRow, error) {
 		if err != nil {
 			break
 		}
+		if strings.Contains(path.Dir(hdr.Name), "/") {
+			// Skip files not at top level
+			continue
+		}
 		if path.Base(hdr.Name) != "syncthing" {
 			continue
 		}
@@ -210,17 +214,25 @@ func getVersionFromReader(r io.Reader) (tableRow, error) {
 		return tableRow{}, err
 	}
 
+	var errs []error
 	if row, err := getVersionFromCommand(fd.Name()); err == nil {
 		return row, nil
+	} else {
+		errs = append(errs, err)
+	}
+	if row, err := getVersionFromGo(fd.Name()); err == nil {
+		return row, nil
+	} else {
+		errs = append(errs, err)
 	}
-	return getVersionFromGo(fd.Name())
+	return tableRow{}, errors.Join(errs...)
 }
 
 func getVersionFromGo(name string) (tableRow, error) {
 	cmd := exec.Command("go", "version", "-m", name)
-	out, err := cmd.Output()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return tableRow{}, err
+		return tableRow{}, fmt.Errorf("go version -m: %w: %s", err, out)
 	}
 
 	// % go version -m ~/bin/syncthing
@@ -229,28 +241,28 @@ func getVersionFromGo(name string) (tableRow, error) {
 	// ...
 
 	if idx := bytes.Index(out, []byte{'\n'}); idx < 0 {
-		return tableRow{}, errors.New("no version")
+		return tableRow{}, errors.New("go version -m: no version")
 	} else {
 		out = out[:idx]
 	}
 
 	if idx := bytes.LastIndex(out, []byte{' '}); idx < 0 {
-		return tableRow{}, errors.New("no version")
+		return tableRow{}, errors.New("go version -m: no version")
 	} else {
 		return tableRow{Runtime: string(out[idx+1:])}, nil
 	}
 }
 
 func getVersionFromCommand(name string) (tableRow, error) {
 	cmd := exec.Command(name, "--version")
-	out, err := cmd.Output()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return tableRow{}, err
+		return tableRow{}, fmt.Errorf("syncthing: running: %w: %s", err, out)
 	}
 
 	var r tableRow
 	if err := r.fromVersion(string(out)); err != nil {
-		return tableRow{}, err
+		return tableRow{}, fmt.Errorf("syncthing: parse version: %w: %s", err, out)
 	}
 	return r, nil
 }

users/releases.csv

@@ -3,10 +3,24 @@ v2.0.14,go1.25.6,2026-02-02
 v2.0.13,go1.25.5,2025-12-23
 v2.0.12,go1.25.4,2025-11-24
 v2.0.11,go1.25.3,2025-10-27
+v2.0.10,go1.25.1,2025-09-23
+v2.0.9,go1.25.1,2025-09-12
+v2.0.8,go1.25.1,2025-09-08
+v2.0.7,go1.25.1,2025-09-05
+v2.0.6,go1.25.0,2025-09-03
+v2.0.5,go1.25.0,2025-09-02
+v2.0.4,go1.25.0,2025-09-01
 v2.0.3,go1.25.0,2025-08-22
 v2.0.2,go1.25.0,2025-08-08
 v2.0.1,go1.24.6,2025-08-08
 v2.0.0,go1.24.6,2025-08-08
+<<<<<<< HEAD
+||||||| e51f46f
+=======
+v1.30.0,go1.24.4,2025-06-20
+v1.29.7,go1.24.3,2025-05-29
+v1.29.6,go1.24.2,2025-04-30
+>>>>>>> jb/histver
 v1.29.5,go1.24.2,2025-04-12
 v1.29.4,go1.24.1,2025-03-27
 v1.29.3,go1.24.1,2025-03-07
@@ -15,10 +29,15 @@ v1.29.1,go1.23.4,2025-01-09
 v1.29.0,go1.23.4,2024-12-30
 v1.28.1,go1.23.3,2024-11-24
 v1.28.0,go1.23.2,2024-10-04
+v1.27.12,go1.22.6,2024-09-06
 v1.27.11,go1.22.6,2024-08-28
 v1.27.10,go1.22.5,2024-07-22
 v1.27.9,go1.22.4,2024-07-01
+v1.27.8,go1.22.3,2024-05-30
 v1.27.7,go1.22.3,2024-05-08
+v1.27.6,go1.22.2,2024-04-08
+v1.27.5,go1.22.1,2024-03-25
+v1.27.4,go1.22.0,2024-02-27
 v1.27.3,go1.21.6,2024-01-15
 v1.27.2,go1.21.5,2023-12-25
 v1.27.1,go1.21.5,2023-12-11