♻️ Synced dbin 📦 <-- Merge branch 'master' of https://github.com/xplshn/dbin ⌚

Author: Azathothas

go.mod

@@ -5,20 +5,20 @@ go 1.23.2
 require (
 	github.com/fxamacker/cbor/v2 v2.7.0
 	github.com/goccy/go-json v0.10.5
-	github.com/goccy/go-yaml v1.15.23
-	github.com/hedzr/progressbar v1.2.1
+	github.com/goccy/go-yaml v1.16.0
+	github.com/hedzr/progressbar v1.2.5
 	github.com/klauspost/compress v1.18.0
 	github.com/pkg/xattr v0.4.10
 	github.com/tdewolff/minify/v2 v2.21.3
 	github.com/urfave/cli/v3 v3.0.0-beta1
 	github.com/zeebo/blake3 v0.2.4
-	golang.org/x/term v0.29.0
+	golang.org/x/term v0.30.0
 )
 
 require (
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/tdewolff/parse/v2 v2.7.20 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 )

go.sum

@@ -6,12 +6,18 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.15.23 h1:WS0GAX1uNPDLUvLkNU2vXq6oTnsmfVFocjQ/4qA48qo=
 github.com/goccy/go-yaml v1.15.23/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-yaml v1.16.0 h1:d7m1G7A0t+logajVtklHfDYJs2Et9g3gHwdBNNFou0w=
+github.com/goccy/go-yaml v1.16.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/hedzr/progressbar v1.2.1 h1:qKuBxiy11abGRVYkjlBqFDbF1eQw8Ep+DhUocWQ5sJ4=
 github.com/hedzr/progressbar v1.2.1/go.mod h1:riyH9fpOdIDCX5uYvCINnQ1k4+EBueOgT1vJYtLvHRg=
+github.com/hedzr/progressbar v1.2.5 h1:bFZRn8l24HMtjF9+zGh8UGAU25jRdQyNgRX+KAgf1qk=
+github.com/hedzr/progressbar v1.2.5/go.mod h1:JF3k3RCYR0X0nThFxsKqbPOezDmgufo99+v5TyrmKw0=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
 github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/pkg/xattr v0.4.10 h1:Qe0mtiNFHQZ296vRgUjRCoPHPqH7VdTOrZx3g0T+pGA=
 github.com/pkg/xattr v0.4.10/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -39,10 +45,16 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
 golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

info.go

@@ -17,27 +17,10 @@ func infoCommand() *cli.Command {
 			if err != nil {
 				return err
 			}
-			uRepoIndex := fetchRepoIndex(config)
 			var bEntry binaryEntry
 			if c.Args().First() != "" {
+				uRepoIndex := fetchRepoIndex(config)
 				bEntry = stringToBinaryEntry(c.Args().First())
-			}
-			if bEntry.Name == "" {
-				files, err := listFilesInDir(config.InstallDir)
-				if err != nil {
-					return err
-				}
-				installedPrograms := make([]string, 0)
-				for _, file := range files {
-					trackedBEntry := bEntryOfinstalledBinary(file)
-					if trackedBEntry.Name != "" {
-						installedPrograms = append(installedPrograms, parseBinaryEntry(trackedBEntry, true))
-					}
-				}
-				for _, program := range installedPrograms {
-					fmt.Println(program)
-				}
-			} else {
 				binaryInfo, err := getBinaryInfo(config, bEntry, uRepoIndex)
 				if err != nil {
 					return err
@@ -81,6 +64,21 @@ func infoCommand() *cli.Command {
 						}
 					}
 				}
+			} else {
+				files, err := listFilesInDir(config.InstallDir)
+				if err != nil {
+					return err
+				}
+				installedPrograms := make([]string, 0)
+				for _, file := range files {
+					trackedBEntry := bEntryOfinstalledBinary(file)
+					if trackedBEntry.Name != "" {
+						installedPrograms = append(installedPrograms, parseBinaryEntry(trackedBEntry, true))
+					}
+				}
+				for _, program := range installedPrograms {
+					fmt.Println(program)
+				}
 			}
 			return nil
 		},

install.go

@@ -92,24 +92,26 @@ func installBinaries(ctx context.Context, config *Config, bEntries []binaryEntry
 					defer wg.Done()
 					_, fetchErr := fetchBinaryFromURLToDest(ctx, bar, url, checksum, destination)
 					if fetchErr != nil {
-						errors = append(errors, fmt.Sprintf("error: error fetching binary %s: %v", bEntry.Name, fetchErr))
+						errors = append(errors, fmt.Sprintf("error: error fetching binary %s: %v\n", bEntry.Name, fetchErr))
 						return
 					}
 
 					if err := os.Chmod(destination, 0755); err != nil {
-						errors = append(errors, fmt.Sprintf("error: error making binary executable %s: %v", destination, err))
+						errors = append(errors, fmt.Sprintf("error: error making binary executable %s: %v\n", destination, err))
 						return
 					}
 
 					if err := runIntegrationHooks(config, destination, verbosityLevel, uRepoIndex); err != nil {
-						errors = append(errors, fmt.Sprintf("error: [%s] could not be handled by its default hooks: %v", bEntry.Name, err))
+						errors = append(errors, fmt.Sprintf("error: [%s] could not be handled by its default hooks: %v\n", bEntry.Name, err))
 						return
 					}
 
-					binInfo, _ := getBinaryInfo(config, bEntry, uRepoIndex)
-					if err := embedBEntry(destination, *binInfo); err != nil {
-						errors = append(errors, fmt.Sprintf("error: failed to add fullName property to the binary's xattr %s: %v", destination, err))
-						return
+					binInfo, err := getBinaryInfo(config, bEntry, uRepoIndex)
+					if err == nil {
+						if err := embedBEntry(destination, *binInfo); err != nil {
+							errors = append(errors, fmt.Sprintf("error: failed to add fullName property to the binary's xattr %s: %v\n", destination, err))
+							return
+						}
 					}
 				}),
 			)