♻️ Synced dbin 📦 <-- config.go: hooks: change env var values ⌚

Author: Azathothas

README.md

@@ -4,7 +4,7 @@
 [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/xplshn/dbin?include_prereleases)](https://github.com/xplshn/dbin/releases/latest)
 ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/xplshn/dbin)
 
-<p align="center"><img src="https://github.com/user-attachments/assets/3c2dd460-6590-4e69-9c08-69bcccf77d9d" alt="dbin logo, made by a professional (my brother)" width="150" /></p>
+<p align="center"><img src="https://raw.githubusercontent.com/xplshn/dbin/master/misc/assets/pin.svg" alt="dbin logo, made with love, by @peacefulwilliam <github.com/contrarybaton60>" width="150" /></p>
 
 <!--[Makes my repo look bad because these usually show "Failing"]-------------------------------------------------------------------------------------------
 [![AMD64 repo status](https://github.com/Azathothas/Toolpacks/actions/workflows/build_x86_64_Linux.yaml/badge.svg)](https://github.com/Azathothas/Toolpacks)
@@ -17,7 +17,7 @@ dbin can also work on systems other than Linux, but given that we don't have rep
 
 > Why?
 
- "I tend to think the drawbacks of dynamic linking outweigh the advantages for many (most?) applications." – John Carmack. If you are looking for more in-depth arguments, see: [dynlib - drewdevault.com](https://drewdevault.com/dynlib.html), [cat-v.ORG - Dynamic Linking](https://harmful.cat-v.org/software/dynamic-linking)
+"I tend to think the drawbacks of dynamic linking outweigh the advantages for many (most?) applications." – John Carmack. If you are looking for more in-depth arguments, see: [dynlib - drewdevault.com](https://drewdevault.com/dynlib.html), [cat-v.ORG - Dynamic Linking](https://harmful.cat-v.org/software/dynamic-linking)
 
 > I've seen lots of package manager projects without "packages". What is different about this one?
 
@@ -70,7 +70,7 @@ $ dbin --help
     dbin info
     dbin info | grep a-utils | xargs dbin add # install the entire a-utils suite
     dbin info jq
-    dbin list --described
+    dbin list --detailed
     dbin tldr gum
     dbin --verbose run curl -qsfSL "https://raw.githubusercontent.com/xplshn/dbin/master/stubdl" | sh -
     dbin --silent run --transparent micro ~/.profile
@@ -117,7 +117,7 @@ Rank: 1102
 Snapshots: HEAD-9b3f7ff-250119T130748-x86_64-linux [2.0.14]
 ```
 ##### Arguments of `list`
-`list` can receive the optional argument `--described`/`-d`. It will display all binaries + their description
+`list` can receive the optional argument `--detailed`/`-d`. It will display all binaries + their description
 ##### Arguments of `search`
 `search` can only receive various search terms, if the name of a binary or a description of a binary contains the term, it is shown as a search result.
 `search` can optionally receive a `--limit` argument, which changes the limit on how many search results can be displayed (default is 90) (you can also put this in your config)
@@ -144,10 +144,9 @@ system_info=$(wget -qO- "https://raw.githubusercontent.com/xplshn/dbin/master/st
 ![image](https://github.com/user-attachments/assets/949465ab-9572-404f-b02d-319eb3bc2fe0)
 ![image](https://github.com/user-attachments/assets/64700072-a087-4206-8b52-212ecfea668d)
 
-### Where do these binaries come from? ![pin](https://raw.githubusercontent.com/xplshn/dbin/master/misc/assets/pin.svg)
-- [AppBundleHub](https://github.com/xplshn/AppBundleHUB)
-- [PkgForge's repos](https://docs.pkgforge.dev/repositories)
-   - Note however that pkgforge also has dynamic (unportable) programs/packages (that only run on Debian & derivatives), `dbin` filters these out, leaving behind only the static/portable programs.
+###### dbin uses a format for defining the repository index file that is derived from the endpoints provided by Pkgforge. During this step, we remove unportable programs and re-order variants based on their ID (smaller binaries are prioritized)
+
+`dbin` is a package manager, which can use any repos. But it comes with a strong default selection by default.
 
 > Hmm, can I add my own repos?
 
@@ -195,9 +194,31 @@ NOTE: Not all fields are essential :)
 
 A schema of the metadata format can be found here [/misc/cmd/dbinRepoIndexGenerators/*/generator.go](https://github.com/xplshn/dbin/tree/master/misc/cmd/dbinRepoIndexGenerators)
 
-## Repositories you can optionally enable/add to your config ![pin](https://raw.githubusercontent.com/xplshn/dbin/master/misc/assets/pin.svg)
-- `https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/1.5/AM_amd64_linux.lite.cbor.zst`
-  - The binaries in this repository come from the AM package manager, they aren't guaranteed to work everywhere, unlike the binaries in the official repos. But a lot of these are useful and do work. I recommend you check it out
+# Acknowledgements
+
+### Default repos ![pin](https://raw.githubusercontent.com/xplshn/dbin/master/misc/assets/pin.svg)
+- [PkgForge's repos](https://docs.pkgforge.dev/repositories): Portable programs that are truly static, or otherwise self-contained using a wrapper format
+   ![pkgforge_repo](https://raw.githubusercontent.com/xplshn/dbin/master/misc/assets/pkgforge.svg)
+   - <!-- PKGFORGE_COUNT -->
+   - Note however that pkgforge also has dynamic (unportable) programs/packages (that only run on Debian & derivatives), `dbin` filters these out, leaving behind only the static/portable programs.
+- [AppBundleHub](https://github.com/xplshn/AppBundleHUB): Portable programs in .AppBundle format
+  - <!-- APPBUNDLEHUB_COUNT -->
+
+## Optional repos
+- [AM repo](https://github.com/ivan-hc/am): `https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/1.5/AM_amd64_linux.lite.cbor.zst`
+  - Note that the binaries in this repository come from the AM package manager, they aren't guaranteed to work everywhere, unlike the binaries in the default repos. But a lot of these are useful and do work even on Musl systems. I recommend you check it out
+  - <!-- AM_COUNT -->
+  - URL: `https://d.xplshn.com.ar/misc/cmd/1.5/AM_amd64_linux.lite.cbor.zst`
+
+- [PkgForge Go repo](https://github.com/ivan-hc/am): `https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/1.5/pkgforge-go_amd64_linux.lite.cbor.zst`
+  - The binaries in this repo are Go projects that have been fetched, filtered and built automagically
+  - <!-- GO_COUNT -->
+  - URL: `https://d.xplshn.com.ar/misc/cmd/1.5/pkgforge-go_amd64_linux.lite.cbor.zst`
+
+- [PkgForge Cargo repo](https://github.com/ivan-hc/am): `https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/1.5/pkgforge-cargo_amd64_linux.lite.cbor.zst`
+  - The binaries in this repo are Rust projects that have been fetched, filtered and built automagically
+  - <!-- CARGO_COUNT -->
+  - URL: `https://d.xplshn.com.ar/misc/cmd/1.5/pkgforge-cargo_amd64_linux.lite.cbor.zst`
 
 ### Libraries
 I am using these libraries for `dbin`:

config.go

@@ -23,6 +23,7 @@ var (
 	errConfigFileAccess = errs.Class("config file access error")
 	errCommandExecution = errs.Class("command execution error")
 	errSplitArgs        = errs.Class("split args error")
+	arch                = runtime.GOARCH + "_" + runtime.GOOS
 )
 
 type repository struct {
@@ -36,6 +37,8 @@ type config struct {
 	Repositories        []repository `yaml:"Repositories" env:"DBIN_REPO_URLS" description:"List of repositories to fetch binaries from."`
 	InstallDir          string       `yaml:"InstallDir" env:"DBIN_INSTALL_DIR XDG_BIN_HOME" description:"Directory where binaries will be installed."`
 	CacheDir            string       `yaml:"CacheDir" env:"DBIN_CACHE_DIR" description:"Directory where cached binaries will be stored."`
+	LicenseDir          string       `yaml:"LicenseDir" env:"DBIN_LICENSE_DIR" description:"Directory where license files will be stored."`
+	CreateLicenses      bool         `yaml:"CreateLicenses" env:"DBIN_CREATE_LICENSES" description:"Enable saving of license files from OCI downloads."`
 	Limit               uint         `yaml:"SearchResultsLimit" description:"Limit the number of search results displayed."`
 	ProgressbarStyle    int          `yaml:"PbarStyle,omitempty" description:"Style of the progress bar."`
 	DisableTruncation   bool         `yaml:"Truncation" env:"DBIN_NOTRUNCATION" description:"Disable truncation of output."`
@@ -75,13 +78,20 @@ func configCommand() *cli.Command {
 		},
 		Action: func(_ context.Context, c *cli.Command) error {
 			if c.Bool("new") {
-				return createDefaultConfig()
+				configFilePath := os.Getenv("DBIN_CONFIG_FILE")
+				if configFilePath == "" {
+					userConfigDir, err := os.UserConfigDir()
+					if err != nil {
+						return errConfigFileAccess.Wrap(err)
+					}
+					configFilePath = filepath.Join(userConfigDir, "dbin", "dbin.yaml")
+				}
+				return createDefaultConfigAt(configFilePath)
 			} else if c.Bool("show") {
 				config, err := loadConfig()
 				if err != nil {
 					return errConfigLoad.Wrap(err)
 				}
-
 				printConfig(config)
 				return nil
 			}
@@ -95,7 +105,7 @@ func printConfig(config *config) {
 	v := reflect.ValueOf(config).Elem()
 	t := v.Type()
 
-	for i := range v.NumField() {
+	for i := 0; i < v.NumField(); i++ {
 		field := v.Field(i)
 		fieldType := t.Field(i)
 		description := fieldType.Tag.Get("description")
@@ -145,18 +155,12 @@ func splitArgs(cmd string) ([]string, error) {
 	return args, nil
 }
 
-func executeHookCommand(config *config, cmdTemplate, bEntryPath, extension string, isIntegration bool) error {
-	hookCommands, exists := config.Hooks.Commands[extension]
-	if !exists {
-		return errCommandExecution.New("no commands found for extension: %s", extension)
-	}
-
+func executeHookCommand(config *config, hookCommands *hookCommands, ext, bEntryPath string, isIntegration bool) error {
 	if hookCommands.NoOp {
 		return nil
 	}
 
-	cmd := strings.ReplaceAll(cmdTemplate, "{{binary}}", bEntryPath)
-	commandParts, err := splitArgs(cmd)
+	commandParts, err := splitArgs(hookCommands.IntegrationCommand)
 	if err != nil {
 		return errCommandExecution.Wrap(err)
 	}
@@ -172,10 +176,11 @@ func executeHookCommand(config *config, cmdTemplate, bEntryPath, extension strin
 	env = append(env, fmt.Sprintf("DBIN_CACHE_DIR=%s", config.CacheDir))
 	env = append(env, fmt.Sprintf("DBIN=%s", os.Args[0]))
 	env = append(env, fmt.Sprintf("DBIN_HOOK_BINARY=%s", bEntryPath))
+	env = append(env, fmt.Sprintf("DBIN_HOOK_BINARY_EXT=%s", ext))
 	if isIntegration {
-		env = append(env, "DBIN_HOOK_TYPE=integration")
+		env = append(env, "DBIN_HOOK_TYPE=install")
 	} else {
-		env = append(env, "DBIN_HOOK_TYPE=deintegration")
+		env = append(env, "DBIN_HOOK_TYPE=remove")
 	}
 
 	if hookCommands.Silent {
@@ -212,7 +217,7 @@ func loadConfig() (*config, error) {
 		if err != nil {
 			return nil, errConfigFileAccess.Wrap(err)
 		}
-		configFilePath = filepath.Join(userConfigDir, "dbin.yaml")
+		configFilePath = filepath.Join(userConfigDir, "dbin", "dbin.yaml")
 	}
 
 	if _, err := os.Stat(configFilePath); os.IsNotExist(err) {
@@ -225,7 +230,6 @@ func loadConfig() (*config, error) {
 		return nil, errConfigLoad.Wrap(err)
 	}
 
-	arch := runtime.GOARCH + "_" + runtime.GOOS
 	for v := version - 0.1; v >= version-0.3; v -= 0.1 {
 		url := fmt.Sprintf("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/%.1f/%s%s", v, arch, ".lite.cbor.zst")
 		for _, repo := range cfg.Repositories {
@@ -260,7 +264,6 @@ func overrideWithEnv(cfg *config) {
 				case reflect.String:
 					field.SetString(value)
 				case reflect.Slice:
-					// Special handling for []Repository
 					if field.Type() == reflect.TypeOf([]repository{}) {
 						urls := strings.Split(value, ",")
 						var repos []repository
@@ -292,7 +295,7 @@ func overrideWithEnv(cfg *config) {
 		return false
 	}
 
-	for i := range v.NumField() {
+	for i := 0; i < v.NumField(); i++ {
 		field := v.Field(i)
 		envTags := strings.Fields(t.Field(i).Tag.Get("env"))
 
@@ -315,7 +318,14 @@ func setDefaultValues(config *config) {
 		return
 	}
 	config.CacheDir = filepath.Join(tempDir, "dbin_cache")
-	arch := runtime.GOARCH + "_" + runtime.GOOS
+
+	userConfigDir, err := os.UserConfigDir()
+	if err != nil {
+		fmt.Printf("failed to get user's Config directory: %v\n", err)
+		return
+	}
+	config.LicenseDir = filepath.Join(userConfigDir, "dbin", "licenses")
+	config.CreateLicenses = true
 
 	config.Repositories = []repository{
 		{
@@ -329,34 +339,22 @@ func setDefaultValues(config *config) {
 	}
 
 	config.DisableTruncation = false
-	config.Limit = 90
+	config.Limit = 9999
 	config.UseIntegrationHooks = true
 	config.RetakeOwnership = false
 	config.ProgressbarStyle = 1
 	config.DisableProgressbar = false
 	config.NoConfig = false
 }
 
-func createDefaultConfig() error {
-	configFilePath := os.Getenv("DBIN_CONFIG_FILE")
-	if configFilePath == "" {
-		userConfigDir, err := os.UserConfigDir()
-		if err != nil {
-			return errConfigFileAccess.Wrap(err)
-		}
-		configFilePath = filepath.Join(userConfigDir, "dbin.yaml")
-	}
-	return createDefaultConfigAt(configFilePath)
-}
-
 func createDefaultConfigAt(configFilePath string) error {
 	cfg := config{}
 	setDefaultValues(&cfg)
 	overrideWithEnv(&cfg)
 
 	cfg.Hooks = hooks{
 		Commands: map[string]hookCommands{
-			"": {
+			"*": {
 				IntegrationCommand:   "sh -c \"$DBIN info > ${DBIN_CACHE_DIR}/.info\"",
 				DeintegrationCommand: "sh -c \"$DBIN info > ${DBIN_CACHE_DIR}/.info\"",
 				UseRunFromCache:      true,