Fix dlcache basepath

.goreleaser.yaml

@@ -1,12 +1,13 @@
 before:
   hooks:
     - go mod tidy
-    - go generate
 builds:
   - id: lure
     env:
       - CGO_ENABLED=0
     binary: lure
+    ldflags:
+      - -X go.elara.ws/lure/internal/config.Version={{.Version}}
     goos:
       - linux
     goarch:
@@ -16,22 +17,29 @@ builds:
       - arm
       - riscv64
 archives:
-  - replacements:
+  - name_template: >-
-      386: i386
+      {{- .ProjectName}}-
-      amd64: x86_64
+      {{- .Version}}-
-      arm64: aarch64
+      {{- .Os}}-
+      {{- if .Arch | eq "amd64"}}x86_64
+      {{- else if .Arch | eq "386"}}i386
+      {{- else if .Arch | eq "arm64"}}aarch64
+      {{- else }}{{ .Arch }}{{ end -}}
     files:
       - scripts/completion/*
 nfpms:
   - id: lure
     package_name: linux-user-repository
-    file_name_template: '{{.PackageName}}-{{.Version}}-{{.Os}}-{{.Arch}}'
+    file_name_template: >-
+      {{- .PackageName}}-
+      {{- .Version}}-
+      {{- .Os}}-
+      {{- if .Arch | eq "amd64"}}x86_64
+      {{- else if .Arch | eq "386"}}i386
+      {{- else if .Arch | eq "arm64"}}aarch64
+      {{- else }}{{ .Arch }}{{ end -}}
     description: "Linux User REpository"
-    replacements:
+    homepage: 'https://lure.sh'
-      386: i386
-      amd64: x86_64
-      arm64: aarch64
-    homepage: 'https://gitea.elara.ws/Elara6331/lure'
     maintainer: 'Elara Musayelyan <elara@elara.ws>'
     license: GPLv3
     formats:
@@ -52,7 +60,7 @@ nfpms:
         dst: /usr/share/zsh/site-functions/_lure
 aurs:
   - name: linux-user-repository-bin
-    homepage: 'https://gitea.elara.ws/Elara6331/lure'
+    homepage: 'https://lure.sh'
     description: "Linux User REpository"
     maintainers:
       - 'Elara Musayelyan <elara@elara.ws>'
@@ -77,7 +85,7 @@ aurs:
       install -Dm755 ./scripts/completion/zsh ${pkgdir}/usr/share/zsh/site-functions/_lure
 release:
   gitea:
-    owner: Elara6331
+    owner: lure
     name: lure
 gitea_urls:
   api: 'https://gitea.elara.ws/api/v1/'

Makefile

@@ -1,7 +1,8 @@
 PREFIX ?= /usr/local
+GIT_VERSION = $(shell git describe --tags )
 
-lure: internal/config/version.txt
+lure:
-	CGO_ENABLED=0 go build
+	CGO_ENABLED=0 go build -ldflags="-X 'go.elara.ws/lure/internal/config.Version=$(GIT_VERSION)'"
 
 clean:
 	rm -f lure
@@ -16,7 +17,4 @@ installmisc:
 uninstall:
 	rm -f /usr/local/bin/lure
 
-internal/config/version.txt:
+.PHONY: install clean uninstall installmisc lure
-	go generate ./internal/config
-
-.PHONY: install clean uninstall installmisc

README.md

@@ -3,7 +3,7 @@
 # LURE (Linux User REpository)
 
 [![Go Report Card](https://goreportcard.com/badge/go.elara.ws/lure)](https://goreportcard.com/report/go.elara.ws/lure)
-[![status-badge](https://ci.elara.ws/api/badges/Elara6331/lure/status.svg)](https://ci.elara.ws/Elara6331/lure)
+[![status-badge](https://ci.elara.ws/api/badges/lure/lure/status.svg)](https://ci.elara.ws/lure/lure)
 [![linux-user-repository-bin AUR package](https://img.shields.io/aur/version/linux-user-repository-bin?label=linux-user-repository-bin&logo=archlinux)](https://aur.archlinux.org/packages/linux-user-repository-bin/)
 
 LURE is a distro-agnostic build system for Linux, similar to the [AUR](https://wiki.archlinux.org/title/Arch_User_Repository). It is currently in **beta**. Most major bugs have been fixed, and most major features have been added. LURE is ready for general use, but may still break or change occasionally.
@@ -19,14 +19,14 @@ LURE is written in pure Go and has zero dependencies after building. The only th
 The LURE install script will automatically download and install the appropriate LURE package on your system. To use it, simply run the following command:
 
 ```bash
-curl https://www.elara.ws/lure.sh | bash
+curl -fsSL lure.sh/install | bash
 ```
 
 **IMPORTANT**: This method is not recommended as it executes any code that is stored at that URL. In order to make sure nothing malicious is going to occur, download the script and inspect it before running.
 
 ### Packages
 
-Distro packages and binary archives are provided at the latest Gitea release: https://gitea.elara.ws/Elara6331/lure/releases/latest
+Distro packages and binary archives are provided at the latest Gitea release: https://gitea.elara.ws/lure/lure/releases/latest
 
 LURE is also available on the AUR as [linux-user-repository-bin](https://aur.archlinux.org/packages/linux-user-repository-bin)
 
@@ -42,7 +42,7 @@ sudo make install
 
 ## Why?
 
-Arch Linux's AUR is a very useful feature. It's one of the main reasons I and many others use Arch on most of their devices. However, Arch is not always a good choice. Whether you're running a server that needs to be stable over long periods of time, or you're a beginner and feel intimidated by Arch, there are many different reasons not to use it. Such useful functionality should not be restricted to only a single distro. That is what LURE is meant to solve.
+LURE was created because packaging software for multiple Linux distros can be difficult and error-prone, and installing those packages can be a nightmare for users unless they're available in their distro's official repositories. It automates the process of building and installing unofficial packages.
 
 ---
 
@@ -54,19 +54,19 @@ The documentation for LURE is in the [docs](docs) directory in this repo.
 
 ## Web Interface
 
-LURE now has a web interface! It's open source, licensed under the AGPLv3 (https://gitea.elara.ws/Elara6331/lure-web), and is available at https://lure.elara.ws.
+LURE has an open source web interface, licensed under the AGPLv3 (https://gitea.elara.ws/lure/lure-web), and it's available at https://lure.sh/.
 
 ---
 
 ## Repositories
 
-Unlike the AUR, LURE supports third-party repositories. Also unlike the AUR, LURE's repos are single git repositories containing all the build scripts. Inside each LURE repo, there is a separate directory for each package, containing a `lure.sh` script, which is a PKGBUILD-like build script for LURE. The default repository is hosted on Github: https://github.com/Elara6331/lure-repo, and information about its packages is displayed at https://lure.elara.ws/pkgs.
+LURE's repos are git repositories that contain a directory for each package, with a `lure.sh` file inside. The `lure.sh` file tells LURE how to build the package and information about it. `lure.sh` scripts are similar to the AUR's PKGBUILD scripts.
 
 ---
 
-## Dependencies
+## Acknowledgements
 
-As mentioned before, LURE has zero dependencies after compilation. Thanks to the following projects for making this possible:
+Thanks to the following projects for making LURE possible:
 
 - https://github.com/mvdan/sh
 - https://github.com/go-git/go-git
@@ -74,9 +74,3 @@ As mentioned before, LURE has zero dependencies after compilation. Thanks to the
 - https://github.com/goreleaser/nfpm
 - https://github.com/charmbracelet/bubbletea
 - https://gitlab.com/cznic/sqlite
-
----
-
-## Planned Features
-
-- Automated docker-based testing tool

build.go

@@ -23,13 +23,13 @@ import (
 	"path/filepath"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/build"
 	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/osutils"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/build"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/manager"
+	"go.elara.ws/lure/pkg/repos"
 )
 
 var buildCmd = &cli.Command{
@@ -54,12 +54,15 @@ var buildCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		script := c.String("script")
 		if c.String("package") != "" {
-			script = filepath.Join(config.GetPaths().RepoDir, c.String("package"), "lure.sh")
+			script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "lure.sh")
 		}
 
-		err := repos.Pull(c.Context, config.Config().Repos)
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repositories").Err(err).Send()
 		}
@@ -69,7 +72,7 @@ var buildCmd = &cli.Command{
 			log.Fatal("Unable to detect a supported package manager on the system").Send()
 		}
 
-		pkgPaths, _, err := build.BuildPackage(c.Context, types.BuildOpts{
+		pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
 			Script:      script,
 			Manager:     mgr,
 			Clean:       c.Bool("clean"),

cmd/lure-api-server/Dockerfile

@@ -1,3 +0,0 @@
-FROM alpine:latest
-COPY lure-api-server /usr/bin/lure-api-server
-ENTRYPOINT lure-api-server

cmd/lure-api-server/README.md

@@ -1,3 +0,0 @@
-# lure-api-server
-
-`lure-api-server` is the backend API server for lure-web, the web interface for LURE.

cmd/lure-api-server/api.go

@@ -1,202 +0,0 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package main
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/twitchtv/twirp"
-	"go.elara.ws/lure/internal/api"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
-	"golang.org/x/text/language"
-)
-
-type lureWebAPI struct{}
-
-func (l lureWebAPI) Search(ctx context.Context, req *api.SearchRequest) (*api.SearchResponse, error) {
-	query := "(name LIKE ? OR description LIKE ? OR json_array_contains(provides, ?))"
-	args := []any{"%" + req.Query + "%", "%" + req.Query + "%", req.Query}
-
-	if req.FilterValue != nil && req.FilterType != api.FILTER_TYPE_NO_FILTER {
-		switch req.FilterType {
-		case api.FILTER_TYPE_IN_REPOSITORY:
-			query += " AND repository = ?"
-		case api.FILTER_TYPE_SUPPORTS_ARCH:
-			query += " AND json_array_contains(architectures, ?)"
-		}
-		args = append(args, *req.FilterValue)
-	}
-
-	if req.SortBy != api.SORT_BY_UNSORTED {
-		switch req.SortBy {
-		case api.SORT_BY_NAME:
-			query += " ORDER BY name"
-		case api.SORT_BY_REPOSITORY:
-			query += " ORDER BY repository"
-		case api.SORT_BY_VERSION:
-			query += " ORDER BY version"
-		}
-	}
-
-	if req.Limit != 0 {
-		query += " LIMIT " + strconv.FormatInt(req.Limit, 10)
-	}
-
-	result, err := db.GetPkgs(query, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	out := &api.SearchResponse{}
-	for result.Next() {
-		pkg := &db.Package{}
-		err = result.StructScan(pkg)
-		if err != nil {
-			return nil, err
-		}
-		out.Packages = append(out.Packages, dbPkgToAPI(ctx, pkg))
-	}
-
-	return out, err
-}
-
-func (l lureWebAPI) GetPkg(ctx context.Context, req *api.GetPackageRequest) (*api.Package, error) {
-	pkg, err := db.GetPkg("name = ? AND repository = ?", req.Name, req.Repository)
-	if err != nil {
-		return nil, err
-	}
-	return dbPkgToAPI(ctx, pkg), nil
-}
-
-func (l lureWebAPI) GetBuildScript(ctx context.Context, req *api.GetBuildScriptRequest) (*api.GetBuildScriptResponse, error) {
-	if strings.ContainsAny(req.Name, "./") || strings.ContainsAny(req.Repository, "./") {
-		return nil, twirp.NewError(twirp.InvalidArgument, "name and repository must not contain . or /")
-	}
-
-	scriptPath := filepath.Join(config.GetPaths().RepoDir, req.Repository, req.Name, "lure.sh")
-	_, err := os.Stat(scriptPath)
-	if os.IsNotExist(err) {
-		return nil, twirp.NewError(twirp.NotFound, "requested package not found")
-	} else if err != nil {
-		return nil, err
-	}
-
-	data, err := os.ReadFile(scriptPath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.GetBuildScriptResponse{Script: string(data)}, nil
-}
-
-func dbPkgToAPI(ctx context.Context, pkg *db.Package) *api.Package {
-	return &api.Package{
-		Name:          pkg.Name,
-		Repository:    pkg.Repository,
-		Version:       pkg.Version,
-		Release:       int64(pkg.Release),
-		Epoch:         ptr(int64(pkg.Epoch)),
-		Description:   performTranslation(ctx, pkg.Description.Val),
-		Homepage:      performTranslation(ctx, pkg.Homepage.Val),
-		Maintainer:    performTranslation(ctx, pkg.Maintainer.Val),
-		Architectures: pkg.Architectures.Val,
-		Licenses:      pkg.Licenses.Val,
-		Provides:      pkg.Provides.Val,
-		Conflicts:     pkg.Conflicts.Val,
-		Replaces:      pkg.Replaces.Val,
-		Depends:       dbMapToAPI(pkg.Depends.Val),
-		BuildDepends:  dbMapToAPI(pkg.BuildDepends.Val),
-	}
-}
-
-func ptr[T any](v T) *T {
-	return &v
-}
-
-func dbMapToAPI(m map[string][]string) map[string]*api.StringList {
-	out := make(map[string]*api.StringList, len(m))
-	for override, list := range m {
-		out[override] = &api.StringList{Entries: list}
-	}
-	return out
-}
-
-func performTranslation(ctx context.Context, v map[string]string) *string {
-	alVal := ctx.Value(acceptLanguageKey{})
-	langVal := ctx.Value(langParameterKey{})
-
-	if alVal == nil && langVal == nil {
-		val, ok := v[""]
-		if !ok {
-			return ptr("<unknown>")
-		}
-		return &val
-	}
-
-	al, _ := alVal.(string)
-	lang, _ := langVal.(string)
-
-	tags, _, err := language.ParseAcceptLanguage(al)
-	if err != nil {
-		log.Warn("Error parsing Accept-Language header").Err(err).Send()
-	}
-
-	var bases []string
-	if lang != "" {
-		langTag, err := language.Parse(lang)
-		if err != nil {
-			log.Warn("Error parsing lang parameter").Err(err).Send()
-			bases = getLangBases(tags)
-		} else {
-			bases = getLangBases(append([]language.Tag{langTag}, tags...))
-		}
-	} else {
-		bases = getLangBases(tags)
-	}
-
-	if len(bases) == 1 {
-		bases = []string{"en", ""}
-	}
-
-	for _, name := range bases {
-		val, ok := v[name]
-		if !ok {
-			continue
-		}
-		return &val
-	}
-
-	return ptr("<unknown>")
-}
-
-func getLangBases(langs []language.Tag) []string {
-	out := make([]string, len(langs)+1)
-	for i, lang := range langs {
-		base, _ := lang.Base()
-		out[i] = base.String()
-	}
-	out[len(out)-1] = ""
-	return out
-}

cmd/lure-api-server/badge.go

@@ -1,58 +0,0 @@
-package main
-
-import (
-	_ "embed"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/go-chi/chi/v5"
-	"go.elara.ws/lure/internal/db"
-)
-
-//go:embed badge-logo.txt
-var logoData string
-
-var _ http.HandlerFunc
-
-func handleBadge() http.HandlerFunc {
-	return func(res http.ResponseWriter, req *http.Request) {
-		repo := chi.URLParam(req, "repo")
-		name := chi.URLParam(req, "pkg")
-
-		pkg, err := db.GetPkg("name = ? AND repository = ?", name, repo)
-		if err != nil {
-			http.Error(res, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(res, req, genBadgeURL(pkg.Name, genVersion(pkg)), http.StatusFound)
-	}
-}
-
-func genVersion(pkg *db.Package) string {
-	sb := strings.Builder{}
-	if pkg.Epoch != 0 {
-		sb.WriteString(strconv.Itoa(int(pkg.Epoch)))
-		sb.WriteByte(':')
-	}
-
-	sb.WriteString(pkg.Version)
-
-	if pkg.Release != 0 {
-		sb.WriteByte('-')
-		sb.WriteString(strconv.Itoa(pkg.Release))
-	}
-	return sb.String()
-}
-
-func genBadgeURL(pkgName, pkgVersion string) string {
-	v := url.Values{}
-	v.Set("label", pkgName)
-	v.Set("message", pkgVersion)
-	v.Set("logo", logoData)
-	v.Set("color", "blue")
-	u := &url.URL{Scheme: "https", Host: "img.shields.io", Path: "/static/v1", RawQuery: v.Encode()}
-	return u.String()
-}

cmd/lure-api-server/docker.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build
-docker buildx build --platform linux/amd64 --tag elara6331/lure-api-server:amd64 --no-cache .
-
-CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build
-docker buildx build --platform linux/arm64/v8 --tag elara6331/lure-api-server:arm64 --no-cache .
-
-docker login
-docker push elara6331/lure-api-server -a
-
-docker manifest rm elara6331/lure-api-server:latest
-docker manifest create elara6331/lure-api-server:latest --amend elara6331/lure-api-server:arm64 --amend elara6331/lure-api-server:amd64
-docker manifest push elara6331/lure-api-server:latest

cmd/lure-api-server/main.go

@@ -1,119 +0,0 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package main
-
-import (
-	"context"
-	"flag"
-	"net"
-	"net/http"
-	"os"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/twitchtv/twirp"
-	"go.elara.ws/logger"
-	"go.elara.ws/lure/internal/api"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
-)
-
-func init() {
-	log.Logger = logger.NewPretty(os.Stderr)
-}
-
-func main() {
-	ctx := context.Background()
-
-	addr := flag.String("a", ":8080", "Listen address for API server")
-	logFile := flag.String("l", "", "Output file for JSON log")
-	flag.Parse()
-
-	if *logFile != "" {
-		fl, err := os.Create(*logFile)
-		if err != nil {
-			log.Fatal("Error creating log file").Err(err).Send()
-		}
-		defer fl.Close()
-
-		log.Logger = logger.NewMulti(log.Logger, logger.NewJSON(fl))
-	}
-
-	err := repos.Pull(ctx, config.Config().Repos)
-	if err != nil {
-		log.Fatal("Error pulling repositories").Err(err).Send()
-	}
-
-	sigCh := make(chan struct{}, 200)
-	go repoPullWorker(ctx, sigCh)
-
-	apiServer := api.NewAPIServer(
-		lureWebAPI{},
-		twirp.WithServerPathPrefix(""),
-	)
-
-	r := chi.NewRouter()
-	r.With(allowAllCORSHandler, withAcceptLanguage).Handle("/*", apiServer)
-	r.Post("/webhook", handleWebhook(sigCh))
-	r.Get("/badge/{repo}/{pkg}", handleBadge())
-
-	ln, err := net.Listen("tcp", *addr)
-	if err != nil {
-		log.Fatal("Error starting listener").Err(err).Send()
-	}
-
-	log.Info("Starting HTTP API server").Str("addr", ln.Addr().String()).Send()
-
-	err = http.Serve(ln, r)
-	if err != nil {
-		log.Fatal("Error while running server").Err(err).Send()
-	}
-}
-
-func allowAllCORSHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.Header().Set("Access-Control-Allow-Origin", "*")
-		res.Header().Set("Access-Control-Allow-Headers", "*")
-		if req.Method == http.MethodOptions {
-			return
-		}
-		h.ServeHTTP(res, req)
-	})
-}
-
-type (
-	acceptLanguageKey struct{}
-	langParameterKey  struct{}
-)
-
-func withAcceptLanguage(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		ctx := req.Context()
-
-		langs := req.Header.Get("Accept-Language")
-		ctx = context.WithValue(ctx, acceptLanguageKey{}, langs)
-
-		lang := req.URL.Query().Get("lang")
-		ctx = context.WithValue(ctx, langParameterKey{}, lang)
-
-		req = req.WithContext(ctx)
-
-		h.ServeHTTP(res, req)
-	})
-}

cmd/lure-api-server/webhook.go

@@ -1,99 +0,0 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package main
-
-import (
-	"context"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
-)
-
-func handleWebhook(sigCh chan<- struct{}) http.HandlerFunc {
-	return http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		if req.Header.Get("X-GitHub-Event") != "push" {
-			http.Error(res, "Only push events are accepted by this bot", http.StatusBadRequest)
-			return
-		}
-
-		err := verifySecure(req)
-		if err != nil {
-			http.Error(res, err.Error(), http.StatusForbidden)
-			return
-		}
-
-		sigCh <- struct{}{}
-		return
-	})
-}
-
-func verifySecure(req *http.Request) error {
-	sigStr := req.Header.Get("X-Hub-Signature-256")
-	sig, err := hex.DecodeString(strings.TrimPrefix(sigStr, "sha256="))
-	if err != nil {
-		return err
-	}
-
-	secretStr, ok := os.LookupEnv("LURE_API_GITHUB_SECRET")
-	if !ok {
-		return errors.New("LURE_API_GITHUB_SECRET must be set to the secret used for setting up the github webhook\n\n")
-	}
-	secret := []byte(secretStr)
-
-	h := hmac.New(sha256.New, secret)
-	_, err = io.Copy(h, req.Body)
-	if err != nil {
-		return err
-	}
-
-	if !hmac.Equal(h.Sum(nil), sig) {
-		log.Warn("Insecure webhook request").
-			Str("from", req.RemoteAddr).
-			Bytes("sig", sig).
-			Bytes("hmac", h.Sum(nil)).
-			Send()
-
-		return errors.New("webhook signature mismatch")
-	}
-
-	return nil
-}
-
-func repoPullWorker(ctx context.Context, sigCh <-chan struct{}) {
-	for {
-		select {
-		case <-sigCh:
-			err := repos.Pull(ctx, config.Config().Repos)
-			if err != nil {
-				log.Warn("Error while pulling repositories").Err(err).Send()
-			}
-		case <-ctx.Done():
-			return
-		}
-	}
-}

docs/configuration.md

@@ -36,7 +36,7 @@ The `repo` array in the config specifies which repos are added to LURE. Each rep
 ```toml
 [[repo]]
 name = 'default'
-url = 'https://github.com/Arsen6331/lure-repo.git'
+url = 'https://github.com/Elara6331/lure-repo.git'
 ```
 
 The `default` repo is added by default. Any amount of repos may be added.

docs/packages/adding-packages.md

@@ -5,7 +5,7 @@
 - `go` (1.18+)
 - `git`
 - `lure-analyzer`
-    - `go install go.arsenm.dev/lure-repo-bot/cmd/lure-analyzer@latest`
+    - `go install go.elara.ws/lure-repo-bot/cmd/lure-analyzer@latest`
 - `shfmt`
     - May be available in distro repos
     - `go install mvdan.cc/sh/v3/cmd/shfmt@latest`
@@ -18,9 +18,9 @@ To test packages you can first create [a `lure.sh` shell file](./build-scripts.m
 
 ## How to submit a package
 
-LURE's repo is hosted on Github at https://github.com/Arsen6331/lure-repo. In it, there are multiple directories each containing a `lure.sh` file. In order to add a package to LURE's repo, simply create a PR with a [build script](./build-scripts.md) and place it in a directory with the same name as the package.
+LURE's repo is hosted on Github at https://github.com/Elara6331/lure-repo. In it, there are multiple directories each containing a `lure.sh` file. In order to add a package to LURE's repo, simply create a PR with a [build script](./build-scripts.md) and place it in a directory with the same name as the package.
 
-Upon submitting the PR, [lure-repo-bot](https://github.com/Arsen6331/lure-repo-bot) will pull your PR and analyze it, providing suggestions for fixes as review comments. If there are no problems, the bot will approve your changes. If there are issues, re-request review from the bot after you've finished applying the fixes and it will automatically review the PR again.
+Upon submitting the PR, [lure-repo-bot](https://github.com/Elara6331/lure-repo-bot) will pull your PR and analyze it, providing suggestions for fixes as review comments. If there are no problems, the bot will approve your changes. If there are issues, re-request review from the bot after you've finished applying the fixes and it will automatically review the PR again.
 
 All scripts submitted to the LURE repo should be formatted with `shfmt`. If they are not properly formatted, Github Actions will add suggestions in the "Files Changed" tab of the PR.
 

docs/packages/build-scripts.md

@@ -21,6 +21,7 @@ LURE uses build scripts similar to the AUR's PKGBUILDs. This is the documentatio
     - [conflicts](#conflicts)
     - [deps](#deps)
     - [build_deps](#build_deps)
+    - [opt_deps](#opt_deps)
     - [replaces](#replaces)
     - [sources](#sources)
     - [checksums](#checksums)
@@ -54,7 +55,7 @@ LURE uses build scripts similar to the AUR's PKGBUILDs. This is the documentatio
 
 ## Distro Overrides
 
-Allowing LURE to run on different distros provides some challenges. For example, some distros use different names for their packages. This is solved using distro overrides. Any variable or function used in a LURE build script may be overridden based on distro and CPU architecture. The way you do this is by appending the distro and/or architecture to the end of the name. For example, [ITD](https://gitea.arsenm.dev/Arsen6331/itd) depends on the `pactl` command as well as DBus and BlueZ. These are named somewhat differently on different distros. For ITD, I use the following for the dependencies:
+Allowing LURE to run on different distros provides some challenges. For example, some distros use different names for their packages. This is solved using distro overrides. Any variable or function used in a LURE build script may be overridden based on distro and CPU architecture. The way you do this is by appending the distro and/or architecture to the end of the name. For example, [ITD](https://gitea.elara.ws/Elara6331/itd) depends on the `pactl` command as well as DBus and BlueZ. These are named somewhat differently on different distros. For ITD, I use the following for the dependencies:
 
 ```bash
 deps=('dbus' 'bluez' 'pulseaudio-utils')
@@ -117,7 +118,7 @@ The `homepage` field contains the URL to the website of the project packaged by
 The `maintainer` field contains the name and email address of the person maintaining the package. Example:
 
 ```text
-Arsen Musayelyan <arsen@arsenm.dev>
+Elara Musayelyan <elara@elara.ws>
 ```
 
 While LURE does not require this field to be set, Debian has deprecated unset maintainer fields, and may disallow their use in `.deb` packages in the future.
@@ -160,6 +161,17 @@ The `deps` array contains the dependencies for the package. LURE repos will be c
 
 The `build_deps` array contains the dependencies that are required to build the package. They will be installed before the build starts. Similarly to the `deps` array, LURE repos will be checked first.
 
+### opt_deps
+
+The `opt_deps` array contains optional dependencies for the package. A description can be added after ": ", but it's not required.
+
+```bash
+opt_deps_arch=(
+    'git: Download git repositories'
+    'aria2: Download files'
+)
+```
+
 ### replaces
 
 The `replaces` array contains the packages that are replaced by this package. Generally, if package managers find a package with a `replaces` field set, they will remove the listed package(s) and install that one instead. This is only useful if the packages are being stored in a repo for your package manager.
@@ -190,11 +202,11 @@ If the URL scheme starts with `git+`, the source will be downloaded as a git rep
 Examples:
 
 ```text
-git+https://gitea.arsenm.dev/Arsen6331/itd?~rev=resource-loading&~depth=1
+git+https://gitea.elara.ws/Elara6331/itd?~rev=resource-loading&~depth=1
 ```
 
 ```text
-git+https://gitea.arsenm.dev/Arsen6331/lure?~rev=v0.0.1&~recursive=true
+git+https://gitea.elara.ws/lure/lure?~rev=v0.0.1&~recursive=true
 ```
 
 ### checksums

docs/usage.md

@@ -117,7 +117,7 @@ The addrepo command adds a repository to LURE if it doesn't already exist. The `
 Example:
 
 ```shell
-lure ar -n default -u https://github.com/Arsen6331/lure-repo
+lure ar -n default -u https://github.com/Elara6331/lure-repo
 ```
 
 ### removerepo

fix.go

@@ -24,16 +24,19 @@ import (
 	"github.com/urfave/cli/v2"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/internal/repos"
+	"go.elara.ws/lure/pkg/repos"
 )
 
 var fixCmd = &cli.Command{
 	Name:  "fix",
 	Usage: "Attempt to fix problems with LURE",
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		db.Close()
-		paths := config.GetPaths()
+		paths := config.GetPaths(ctx)
 
 		log.Info("Removing cache directory").Send()
 
@@ -49,7 +52,7 @@ var fixCmd = &cli.Command{
 			log.Fatal("Unable to create new cache directory").Err(err).Send()
 		}
 
-		err = repos.Pull(c.Context, config.Config().Repos)
+		err = repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repos").Err(err).Send()
 		}

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/charmbracelet/bubbles v0.16.1
 	github.com/charmbracelet/bubbletea v0.24.2
 	github.com/charmbracelet/lipgloss v0.8.0
-	github.com/go-chi/chi/v5 v5.0.10
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.9.0
 	github.com/goreleaser/nfpm/v2 v2.33.0
@@ -20,7 +19,6 @@ require (
 	github.com/muesli/reflow v0.3.0
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/twitchtv/twirp v8.1.3+incompatible
 	github.com/urfave/cli/v2 v2.25.7
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	go.elara.ws/logger v0.0.0-20230421022458-e80700db2090
@@ -29,7 +27,6 @@ require (
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
 	golang.org/x/sys v0.12.0
 	golang.org/x/text v0.13.0
-	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.25.0
 	mvdan.cc/sh/v3 v3.7.0

go.sum

@@ -108,8 +108,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
@@ -139,7 +137,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -148,7 +145,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -309,8 +305,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
-github.com/twitchtv/twirp v8.1.3+incompatible h1:+F4TdErPgSUbMZMwp13Q/KgDVuI7HJXP61mNV3/7iuU=
-github.com/twitchtv/twirp v8.1.3+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
@@ -537,9 +531,6 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

info.go

@@ -22,14 +22,13 @@ import (
 	"fmt"
 	"os"
 
-	"go.elara.ws/lure/internal/log"
-
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/cliutils"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/overrides"
-	"go.elara.ws/lure/internal/repos"
+	"go.elara.ws/lure/pkg/distro"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/repos"
 	"gopkg.in/yaml.v3"
 )
 
@@ -44,17 +43,20 @@ var infoCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		args := c.Args()
 		if args.Len() < 1 {
 			log.Fatalf("Command info expected at least 1 argument, got %d", args.Len()).Send()
 		}
 
-		err := repos.Pull(c.Context, config.Config().Repos)
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repositories").Err(err).Send()
 		}
 
-		found, _, err := repos.FindPkgs(args.Slice())
+		found, _, err := repos.FindPkgs(ctx, args.Slice())
 		if err != nil {
 			log.Fatal("Error finding packages").Err(err).Send()
 		}
@@ -63,13 +65,13 @@ var infoCmd = &cli.Command{
 			os.Exit(1)
 		}
 
-		pkgs := cliutils.FlattenPkgs(found, "show", c.Bool("interactive"))
+		pkgs := cliutils.FlattenPkgs(ctx, found, "show", c.Bool("interactive"))
 
 		var names []string
 		all := c.Bool("all")
 
 		if !all {
-			info, err := distro.ParseOSRelease(c.Context)
+			info, err := distro.ParseOSRelease(ctx)
 			if err != nil {
 				log.Fatal("Error parsing os-release file").Err(err).Send()
 			}

install.go

@@ -22,14 +22,14 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/build"
 	"go.elara.ws/lure/internal/cliutils"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/build"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/manager"
+	"go.elara.ws/lure/pkg/repos"
 )
 
 var installCmd = &cli.Command{
@@ -44,6 +44,9 @@ var installCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		args := c.Args()
 		if args.Len() < 1 {
 			log.Fatalf("Command install expected at least 1 argument, got %d", args.Len()).Send()
@@ -54,18 +57,18 @@ var installCmd = &cli.Command{
 			log.Fatal("Unable to detect a supported package manager on the system").Send()
 		}
 
-		err := repos.Pull(c.Context, config.Config().Repos)
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repositories").Err(err).Send()
 		}
 
-		found, notFound, err := repos.FindPkgs(args.Slice())
+		found, notFound, err := repos.FindPkgs(ctx, args.Slice())
 		if err != nil {
 			log.Fatal("Error finding packages").Err(err).Send()
 		}
 
-		pkgs := cliutils.FlattenPkgs(found, "install", c.Bool("interactive"))
+		pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
-		build.InstallPkgs(c.Context, pkgs, notFound, types.BuildOpts{
+		build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
 			Manager:     mgr,
 			Clean:       c.Bool("clean"),
 			Interactive: c.Bool("interactive"),
@@ -73,7 +76,8 @@ var installCmd = &cli.Command{
 		return nil
 	},
 	BashComplete: func(c *cli.Context) {
-		result, err := db.GetPkgs("true")
+		log := loggerctx.From(c.Context)
+		result, err := db.GetPkgs(c.Context, "true")
 		if err != nil {
 			log.Fatal("Error getting packages").Err(err).Send()
 		}
@@ -96,6 +100,8 @@ var removeCmd = &cli.Command{
 	Usage:   "Remove an installed package",
 	Aliases: []string{"rm"},
 	Action: func(c *cli.Context) error {
+		log := loggerctx.From(c.Context)
+
 		args := c.Args()
 		if args.Len() < 1 {
 			log.Fatalf("Command remove expected at least 1 argument, got %d", args.Len()).Send()

internal/api/gen.go

@@ -1,22 +0,0 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package api
-
-//go:generate protoc --twirp_out=. lure.proto
-//go:generate protoc --go_out=. lure.proto

internal/api/lure.pb.go

@@ -1,885 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.31.0
-// 	protoc        v4.24.2
-// source: lure.proto
-
-package api
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// SORT_BY represents possible things to sort packages by
-type SORT_BY int32
-
-const (
-	SORT_BY_UNSORTED   SORT_BY = 0
-	SORT_BY_NAME       SORT_BY = 1
-	SORT_BY_REPOSITORY SORT_BY = 2
-	SORT_BY_VERSION    SORT_BY = 3
-)
-
-// Enum value maps for SORT_BY.
-var (
-	SORT_BY_name = map[int32]string{
-		0: "UNSORTED",
-		1: "NAME",
-		2: "REPOSITORY",
-		3: "VERSION",
-	}
-	SORT_BY_value = map[string]int32{
-		"UNSORTED":   0,
-		"NAME":       1,
-		"REPOSITORY": 2,
-		"VERSION":    3,
-	}
-)
-
-func (x SORT_BY) Enum() *SORT_BY {
-	p := new(SORT_BY)
-	*p = x
-	return p
-}
-
-func (x SORT_BY) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (SORT_BY) Descriptor() protoreflect.EnumDescriptor {
-	return file_lure_proto_enumTypes[0].Descriptor()
-}
-
-func (SORT_BY) Type() protoreflect.EnumType {
-	return &file_lure_proto_enumTypes[0]
-}
-
-func (x SORT_BY) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use SORT_BY.Descriptor instead.
-func (SORT_BY) EnumDescriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{0}
-}
-
-// FILTER_TYPE represents possible filters for packages
-type FILTER_TYPE int32
-
-const (
-	FILTER_TYPE_NO_FILTER     FILTER_TYPE = 0
-	FILTER_TYPE_IN_REPOSITORY FILTER_TYPE = 1
-	FILTER_TYPE_SUPPORTS_ARCH FILTER_TYPE = 2
-)
-
-// Enum value maps for FILTER_TYPE.
-var (
-	FILTER_TYPE_name = map[int32]string{
-		0: "NO_FILTER",
-		1: "IN_REPOSITORY",
-		2: "SUPPORTS_ARCH",
-	}
-	FILTER_TYPE_value = map[string]int32{
-		"NO_FILTER":     0,
-		"IN_REPOSITORY": 1,
-		"SUPPORTS_ARCH": 2,
-	}
-)
-
-func (x FILTER_TYPE) Enum() *FILTER_TYPE {
-	p := new(FILTER_TYPE)
-	*p = x
-	return p
-}
-
-func (x FILTER_TYPE) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (FILTER_TYPE) Descriptor() protoreflect.EnumDescriptor {
-	return file_lure_proto_enumTypes[1].Descriptor()
-}
-
-func (FILTER_TYPE) Type() protoreflect.EnumType {
-	return &file_lure_proto_enumTypes[1]
-}
-
-func (x FILTER_TYPE) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use FILTER_TYPE.Descriptor instead.
-func (FILTER_TYPE) EnumDescriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{1}
-}
-
-// SearchRequest is a request to search for packages
-type SearchRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Query       string      `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	Limit       int64       `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
-	SortBy      SORT_BY     `protobuf:"varint,3,opt,name=sort_by,json=sortBy,proto3,enum=lure.SORT_BY" json:"sort_by,omitempty"`
-	FilterType  FILTER_TYPE `protobuf:"varint,4,opt,name=filter_type,json=filterType,proto3,enum=lure.FILTER_TYPE" json:"filter_type,omitempty"`
-	FilterValue *string     `protobuf:"bytes,5,opt,name=filter_value,json=filterValue,proto3,oneof" json:"filter_value,omitempty"`
-}
-
-func (x *SearchRequest) Reset() {
-	*x = SearchRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SearchRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SearchRequest) ProtoMessage() {}
-
-func (x *SearchRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SearchRequest.ProtoReflect.Descriptor instead.
-func (*SearchRequest) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *SearchRequest) GetQuery() string {
-	if x != nil {
-		return x.Query
-	}
-	return ""
-}
-
-func (x *SearchRequest) GetLimit() int64 {
-	if x != nil {
-		return x.Limit
-	}
-	return 0
-}
-
-func (x *SearchRequest) GetSortBy() SORT_BY {
-	if x != nil {
-		return x.SortBy
-	}
-	return SORT_BY_UNSORTED
-}
-
-func (x *SearchRequest) GetFilterType() FILTER_TYPE {
-	if x != nil {
-		return x.FilterType
-	}
-	return FILTER_TYPE_NO_FILTER
-}
-
-func (x *SearchRequest) GetFilterValue() string {
-	if x != nil && x.FilterValue != nil {
-		return *x.FilterValue
-	}
-	return ""
-}
-
-// StringList contains a list of strings
-type StringList struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Entries []string `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
-}
-
-func (x *StringList) Reset() {
-	*x = StringList{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *StringList) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StringList) ProtoMessage() {}
-
-func (x *StringList) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StringList.ProtoReflect.Descriptor instead.
-func (*StringList) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *StringList) GetEntries() []string {
-	if x != nil {
-		return x.Entries
-	}
-	return nil
-}
-
-// Package represents a LURE package
-type Package struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Repository    string                 `protobuf:"bytes,2,opt,name=repository,proto3" json:"repository,omitempty"`
-	Version       string                 `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
-	Release       int64                  `protobuf:"varint,4,opt,name=release,proto3" json:"release,omitempty"`
-	Epoch         *int64                 `protobuf:"varint,5,opt,name=epoch,proto3,oneof" json:"epoch,omitempty"`
-	Description   *string                `protobuf:"bytes,6,opt,name=description,proto3,oneof" json:"description,omitempty"`
-	Homepage      *string                `protobuf:"bytes,7,opt,name=homepage,proto3,oneof" json:"homepage,omitempty"`
-	Maintainer    *string                `protobuf:"bytes,8,opt,name=maintainer,proto3,oneof" json:"maintainer,omitempty"`
-	Architectures []string               `protobuf:"bytes,9,rep,name=architectures,proto3" json:"architectures,omitempty"`
-	Licenses      []string               `protobuf:"bytes,10,rep,name=licenses,proto3" json:"licenses,omitempty"`
-	Provides      []string               `protobuf:"bytes,11,rep,name=provides,proto3" json:"provides,omitempty"`
-	Conflicts     []string               `protobuf:"bytes,12,rep,name=conflicts,proto3" json:"conflicts,omitempty"`
-	Replaces      []string               `protobuf:"bytes,13,rep,name=replaces,proto3" json:"replaces,omitempty"`
-	Depends       map[string]*StringList `protobuf:"bytes,14,rep,name=depends,proto3" json:"depends,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	BuildDepends  map[string]*StringList `protobuf:"bytes,15,rep,name=build_depends,json=buildDepends,proto3" json:"build_depends,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *Package) Reset() {
-	*x = Package{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Package) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Package) ProtoMessage() {}
-
-func (x *Package) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Package.ProtoReflect.Descriptor instead.
-func (*Package) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Package) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Package) GetRepository() string {
-	if x != nil {
-		return x.Repository
-	}
-	return ""
-}
-
-func (x *Package) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *Package) GetRelease() int64 {
-	if x != nil {
-		return x.Release
-	}
-	return 0
-}
-
-func (x *Package) GetEpoch() int64 {
-	if x != nil && x.Epoch != nil {
-		return *x.Epoch
-	}
-	return 0
-}
-
-func (x *Package) GetDescription() string {
-	if x != nil && x.Description != nil {
-		return *x.Description
-	}
-	return ""
-}
-
-func (x *Package) GetHomepage() string {
-	if x != nil && x.Homepage != nil {
-		return *x.Homepage
-	}
-	return ""
-}
-
-func (x *Package) GetMaintainer() string {
-	if x != nil && x.Maintainer != nil {
-		return *x.Maintainer
-	}
-	return ""
-}
-
-func (x *Package) GetArchitectures() []string {
-	if x != nil {
-		return x.Architectures
-	}
-	return nil
-}
-
-func (x *Package) GetLicenses() []string {
-	if x != nil {
-		return x.Licenses
-	}
-	return nil
-}
-
-func (x *Package) GetProvides() []string {
-	if x != nil {
-		return x.Provides
-	}
-	return nil
-}
-
-func (x *Package) GetConflicts() []string {
-	if x != nil {
-		return x.Conflicts
-	}
-	return nil
-}
-
-func (x *Package) GetReplaces() []string {
-	if x != nil {
-		return x.Replaces
-	}
-	return nil
-}
-
-func (x *Package) GetDepends() map[string]*StringList {
-	if x != nil {
-		return x.Depends
-	}
-	return nil
-}
-
-func (x *Package) GetBuildDepends() map[string]*StringList {
-	if x != nil {
-		return x.BuildDepends
-	}
-	return nil
-}
-
-type GetPackageRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name       string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Repository string `protobuf:"bytes,2,opt,name=repository,proto3" json:"repository,omitempty"`
-}
-
-func (x *GetPackageRequest) Reset() {
-	*x = GetPackageRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetPackageRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetPackageRequest) ProtoMessage() {}
-
-func (x *GetPackageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetPackageRequest.ProtoReflect.Descriptor instead.
-func (*GetPackageRequest) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *GetPackageRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GetPackageRequest) GetRepository() string {
-	if x != nil {
-		return x.Repository
-	}
-	return ""
-}
-
-// SearchResponse contains returned packages
-type SearchResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Packages []*Package `protobuf:"bytes,1,rep,name=packages,proto3" json:"packages,omitempty"`
-}
-
-func (x *SearchResponse) Reset() {
-	*x = SearchResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SearchResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SearchResponse) ProtoMessage() {}
-
-func (x *SearchResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SearchResponse.ProtoReflect.Descriptor instead.
-func (*SearchResponse) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *SearchResponse) GetPackages() []*Package {
-	if x != nil {
-		return x.Packages
-	}
-	return nil
-}
-
-type GetBuildScriptRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name       string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Repository string `protobuf:"bytes,2,opt,name=repository,proto3" json:"repository,omitempty"`
-}
-
-func (x *GetBuildScriptRequest) Reset() {
-	*x = GetBuildScriptRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetBuildScriptRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetBuildScriptRequest) ProtoMessage() {}
-
-func (x *GetBuildScriptRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetBuildScriptRequest.ProtoReflect.Descriptor instead.
-func (*GetBuildScriptRequest) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *GetBuildScriptRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GetBuildScriptRequest) GetRepository() string {
-	if x != nil {
-		return x.Repository
-	}
-	return ""
-}
-
-type GetBuildScriptResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Script string `protobuf:"bytes,1,opt,name=script,proto3" json:"script,omitempty"`
-}
-
-func (x *GetBuildScriptResponse) Reset() {
-	*x = GetBuildScriptResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lure_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetBuildScriptResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetBuildScriptResponse) ProtoMessage() {}
-
-func (x *GetBuildScriptResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_lure_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetBuildScriptResponse.ProtoReflect.Descriptor instead.
-func (*GetBuildScriptResponse) Descriptor() ([]byte, []int) {
-	return file_lure_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *GetBuildScriptResponse) GetScript() string {
-	if x != nil {
-		return x.Script
-	}
-	return ""
-}
-
-var File_lure_proto protoreflect.FileDescriptor
-
-var file_lure_proto_rawDesc = []byte{
-	0x0a, 0x0a, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x6c, 0x75,
-	0x72, 0x65, 0x22, 0xd0, 0x01, 0x0a, 0x0d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x12, 0x26, 0x0a, 0x07, 0x73, 0x6f, 0x72, 0x74, 0x5f, 0x62, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x0d, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x42, 0x59,
-	0x52, 0x06, 0x73, 0x6f, 0x72, 0x74, 0x42, 0x79, 0x12, 0x32, 0x0a, 0x0b, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e,
-	0x6c, 0x75, 0x72, 0x65, 0x2e, 0x46, 0x49, 0x4c, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x52, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0c,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x26, 0x0a, 0x0a, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c,
-	0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xe4, 0x05,
-	0x0a, 0x07, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a,
-	0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a,
-	0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61,
-	0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73,
-	0x65, 0x12, 0x19, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
-	0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x01, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x68, 0x6f, 0x6d, 0x65, 0x70, 0x61, 0x67, 0x65, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x68, 0x6f, 0x6d, 0x65, 0x70, 0x61, 0x67,
-	0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0a, 0x6d, 0x61, 0x69, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x72, 0x63,
-	0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0d, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12,
-	0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x08, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x6c,
-	0x69, 0x63, 0x74, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x66,
-	0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65,
-	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65,
-	0x73, 0x12, 0x34, 0x0a, 0x07, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x0e, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67,
-	0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
-	0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x12, 0x44, 0x0a, 0x0d, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f,
-	0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x75,
-	0x69, 0x6c, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x0c, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x1a, 0x4c, 0x0a,
-	0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
-	0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x42,
-	0x75, 0x69, 0x6c, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x10, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x08,
-	0x0a, 0x06, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x68, 0x6f, 0x6d,
-	0x65, 0x70, 0x61, 0x67, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61,
-	0x69, 0x6e, 0x65, 0x72, 0x22, 0x47, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x61,
-	0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a,
-	0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x3b, 0x0a,
-	0x0e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x29, 0x0a, 0x08, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0d, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65,
-	0x52, 0x08, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x15, 0x47, 0x65,
-	0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73,
-	0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x30, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x42, 0x75,
-	0x69, 0x6c, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2a, 0x3e, 0x0a, 0x07, 0x53, 0x4f, 0x52,
-	0x54, 0x5f, 0x42, 0x59, 0x12, 0x0c, 0x0a, 0x08, 0x55, 0x4e, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a,
-	0x52, 0x45, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07,
-	0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x2a, 0x42, 0x0a, 0x0b, 0x46, 0x49, 0x4c,
-	0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x5f, 0x46,
-	0x49, 0x4c, 0x54, 0x45, 0x52, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x4e, 0x5f, 0x52, 0x45,
-	0x50, 0x4f, 0x53, 0x49, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x55,
-	0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x41, 0x52, 0x43, 0x48, 0x10, 0x02, 0x32, 0xb9, 0x01,
-	0x0a, 0x03, 0x41, 0x50, 0x49, 0x12, 0x33, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12,
-	0x13, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72,
-	0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x47, 0x65,
-	0x74, 0x50, 0x6b, 0x67, 0x12, 0x17, 0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x50,
-	0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e,
-	0x6c, 0x75, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x4b, 0x0a, 0x0e,
-	0x47, 0x65, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x1b,
-	0x2e, 0x6c, 0x75, 0x72, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x6c, 0x75,
-	0x72, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2e, 0x2f,
-	0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_lure_proto_rawDescOnce sync.Once
-	file_lure_proto_rawDescData = file_lure_proto_rawDesc
-)
-
-func file_lure_proto_rawDescGZIP() []byte {
-	file_lure_proto_rawDescOnce.Do(func() {
-		file_lure_proto_rawDescData = protoimpl.X.CompressGZIP(file_lure_proto_rawDescData)
-	})
-	return file_lure_proto_rawDescData
-}
-
-var file_lure_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_lure_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_lure_proto_goTypes = []interface{}{
-	(SORT_BY)(0),                   // 0: lure.SORT_BY
-	(FILTER_TYPE)(0),               // 1: lure.FILTER_TYPE
-	(*SearchRequest)(nil),          // 2: lure.SearchRequest
-	(*StringList)(nil),             // 3: lure.StringList
-	(*Package)(nil),                // 4: lure.Package
-	(*GetPackageRequest)(nil),      // 5: lure.GetPackageRequest
-	(*SearchResponse)(nil),         // 6: lure.SearchResponse
-	(*GetBuildScriptRequest)(nil),  // 7: lure.GetBuildScriptRequest
-	(*GetBuildScriptResponse)(nil), // 8: lure.GetBuildScriptResponse
-	nil,                            // 9: lure.Package.DependsEntry
-	nil,                            // 10: lure.Package.BuildDependsEntry
-}
-var file_lure_proto_depIdxs = []int32{
-	0,  // 0: lure.SearchRequest.sort_by:type_name -> lure.SORT_BY
-	1,  // 1: lure.SearchRequest.filter_type:type_name -> lure.FILTER_TYPE
-	9,  // 2: lure.Package.depends:type_name -> lure.Package.DependsEntry
-	10, // 3: lure.Package.build_depends:type_name -> lure.Package.BuildDependsEntry
-	4,  // 4: lure.SearchResponse.packages:type_name -> lure.Package
-	3,  // 5: lure.Package.DependsEntry.value:type_name -> lure.StringList
-	3,  // 6: lure.Package.BuildDependsEntry.value:type_name -> lure.StringList
-	2,  // 7: lure.API.Search:input_type -> lure.SearchRequest
-	5,  // 8: lure.API.GetPkg:input_type -> lure.GetPackageRequest
-	7,  // 9: lure.API.GetBuildScript:input_type -> lure.GetBuildScriptRequest
-	6,  // 10: lure.API.Search:output_type -> lure.SearchResponse
-	4,  // 11: lure.API.GetPkg:output_type -> lure.Package
-	8,  // 12: lure.API.GetBuildScript:output_type -> lure.GetBuildScriptResponse
-	10, // [10:13] is the sub-list for method output_type
-	7,  // [7:10] is the sub-list for method input_type
-	7,  // [7:7] is the sub-list for extension type_name
-	7,  // [7:7] is the sub-list for extension extendee
-	0,  // [0:7] is the sub-list for field type_name
-}
-
-func init() { file_lure_proto_init() }
-func file_lure_proto_init() {
-	if File_lure_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_lure_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SearchRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StringList); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Package); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPackageRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SearchResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetBuildScriptRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lure_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetBuildScriptResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_lure_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_lure_proto_msgTypes[2].OneofWrappers = []interface{}{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_lure_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   9,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_lure_proto_goTypes,
-		DependencyIndexes: file_lure_proto_depIdxs,
-		EnumInfos:         file_lure_proto_enumTypes,
-		MessageInfos:      file_lure_proto_msgTypes,
-	}.Build()
-	File_lure_proto = out.File
-	file_lure_proto_rawDesc = nil
-	file_lure_proto_goTypes = nil
-	file_lure_proto_depIdxs = nil
-}

internal/api/lure.proto

@@ -1,82 +0,0 @@
-syntax = "proto3";
-package lure;
-
-// Slight hack to provide protoc with a package name
-option go_package = "../api";
-
-// SORT_BY represents possible things to sort packages by
-enum SORT_BY {
-    UNSORTED = 0;
-    NAME = 1;
-    REPOSITORY = 2;
-    VERSION = 3;
-}
-
-// FILTER_TYPE represents possible filters for packages
-enum FILTER_TYPE {
-    NO_FILTER = 0;
-    IN_REPOSITORY = 1;
-    SUPPORTS_ARCH = 2;
-}
-
-// SearchRequest is a request to search for packages
-message SearchRequest {
-    string query = 1;
-    int64 limit = 2;
-    SORT_BY sort_by = 3;
-    FILTER_TYPE filter_type = 4;
-    optional string filter_value = 5;
-}
-
-// StringList contains a list of strings
-message StringList {
-    repeated string entries = 1;
-}
-
-// Package represents a LURE package
-message Package {
-    string name = 1;
-    string repository = 2;
-    string version = 3;
-    int64 release = 4;
-    optional int64 epoch = 5;
-    optional string description = 6;
-    optional string homepage = 7;
-    optional string maintainer = 8;
-    repeated string architectures = 9;
-    repeated string licenses = 10;
-    repeated string provides = 11;
-    repeated string conflicts = 12;
-    repeated string replaces = 13;
-    map<string, StringList> depends = 14;
-    map<string, StringList> build_depends = 15;
-}
-
-message GetPackageRequest {
-    string name = 1;
-    string repository = 2;
-}
-
-// SearchResponse contains returned packages
-message SearchResponse {
-    repeated Package packages = 1;
-}
-
-message GetBuildScriptRequest {
-    string name = 1;
-    string repository = 2;
-}
-
-message GetBuildScriptResponse {
-    string script = 1;
-}
-
-// Web is the LURE Web service
-service API {
-    // Search searches through LURE packages in the database
-    rpc Search(SearchRequest) returns (SearchResponse);
-    // GetPkg gets a single LURE package from the database
-    rpc GetPkg(GetPackageRequest) returns (Package);
-    // GetBuildScript returns the build script for the given package
-    rpc GetBuildScript(GetBuildScriptRequest) returns (GetBuildScriptResponse);
-}

internal/cliutils/prompt.go

@@ -19,23 +19,25 @@
 package cliutils
 
 import (
+	"context"
 	"os"
+	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/pager"
 	"go.elara.ws/lure/internal/translations"
+	"go.elara.ws/lure/pkg/loggerctx"
 )
 
 // YesNoPrompt asks the user a yes or no question, using def as the default answer
-func YesNoPrompt(msg string, interactive, def bool) (bool, error) {
+func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool, error) {
 	if interactive {
 		var answer bool
 		err := survey.AskOne(
 			&survey.Confirm{
-				Message: translations.Translator().TranslateTo(msg, config.Language()),
+				Message: translations.Translator(ctx).TranslateTo(msg, config.Language(ctx)),
 				Default: def,
 			},
 			&answer,
@@ -49,13 +51,15 @@ func YesNoPrompt(msg string, interactive, def bool) (bool, error) {
 // PromptViewScript asks the user if they'd like to see a script,
 // shows it if they answer yes, then asks if they'd still like to
 // continue, and exits if they answer no.
-func PromptViewScript(script, name, style string, interactive bool) error {
+func PromptViewScript(ctx context.Context, script, name, style string, interactive bool) error {
+	log := loggerctx.From(ctx)
+
 	if !interactive {
 		return nil
 	}
 
-	scriptPrompt := translations.Translator().TranslateTo("Would you like to view the build script for", config.Language()) + " " + name
+	scriptPrompt := translations.Translator(ctx).TranslateTo("Would you like to view the build script for", config.Language(ctx)) + " " + name
-	view, err := YesNoPrompt(scriptPrompt, interactive, false)
+	view, err := YesNoPrompt(ctx, scriptPrompt, interactive, false)
 	if err != nil {
 		return err
 	}
@@ -66,13 +70,13 @@ func PromptViewScript(script, name, style string, interactive bool) error {
 			return err
 		}
 
-		cont, err := YesNoPrompt("Would you still like to continue?", interactive, false)
+		cont, err := YesNoPrompt(ctx, "Would you still like to continue?", interactive, false)
 		if err != nil {
 			return err
 		}
 
 		if !cont {
-			log.Fatal(translations.Translator().TranslateTo("User chose not to continue after reading script", config.Language())).Send()
+			log.Fatal(translations.Translator(ctx).TranslateTo("User chose not to continue after reading script", config.Language(ctx))).Send()
 		}
 	}
 
@@ -99,15 +103,16 @@ func ShowScript(path, name, style string) error {
 
 // FlattenPkgs attempts to flatten the a map of slices of packages into a single slice
 // of packages by prompting the user if multiple packages match.
-func FlattenPkgs(found map[string][]db.Package, verb string, interactive bool) []db.Package {
+func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package {
+	log := loggerctx.From(ctx)
 	var outPkgs []db.Package
 	for _, pkgs := range found {
 		if len(pkgs) > 1 && interactive {
-			choices, err := PkgPrompt(pkgs, verb, interactive)
+			choice, err := PkgPrompt(ctx, pkgs, verb, interactive)
 			if err != nil {
 				log.Fatal("Error prompting for choice of package").Send()
 			}
-			outPkgs = append(outPkgs, choices...)
+			outPkgs = append(outPkgs, choice)
 		} else if len(pkgs) == 1 || !interactive {
 			outPkgs = append(outPkgs, pkgs[0])
 		}
@@ -116,10 +121,9 @@ func FlattenPkgs(found map[string][]db.Package, verb string, interactive bool) [
 }
 
 // PkgPrompt asks the user to choose between multiple packages.
-// The user may choose multiple packages.
+func PkgPrompt(ctx context.Context, options []db.Package, verb string, interactive bool) (db.Package, error) {
-func PkgPrompt(options []db.Package, verb string, interactive bool) ([]db.Package, error) {
 	if !interactive {
-		return []db.Package{options[0]}, nil
+		return options[0], nil
 	}
 
 	names := make([]string, len(options))
@@ -127,9 +131,30 @@ func PkgPrompt(options []db.Package, verb string, interactive bool) ([]db.Packag
 		names[i] = option.Repository + "/" + option.Name + " " + option.Version
 	}
 
-	prompt := &survey.MultiSelect{
+	prompt := &survey.Select{
 		Options: names,
-		Message: translations.Translator().TranslateTo("Choose which package(s) to "+verb, config.Language()),
+		Message: translations.Translator(ctx).TranslateTo("Choose which package to "+verb, config.Language(ctx)),
+	}
+
+	var choice int
+	err := survey.AskOne(prompt, &choice)
+	if err != nil {
+		return db.Package{}, err
+	}
+
+	return options[choice], nil
+}
+
+// ChooseOptDepends asks the user to choose between multiple optional dependencies.
+// The user may choose multiple items.
+func ChooseOptDepends(ctx context.Context, options []string, verb string, interactive bool) ([]string, error) {
+	if !interactive {
+		return []string{}, nil
+	}
+
+	prompt := &survey.MultiSelect{
+		Options: options,
+		Message: translations.Translator(ctx).TranslateTo("Choose which optional package(s) to install", config.Language(ctx)),
 	}
 
 	var choices []int
@@ -138,9 +163,9 @@ func PkgPrompt(options []db.Package, verb string, interactive bool) ([]db.Packag
 		return nil, err
 	}
 
-	out := make([]db.Package, len(choices))
+	out := make([]string, len(choices))
 	for i, choiceIndex := range choices {
-		out[i] = options[choiceIndex]
+		out[i], _, _ = strings.Cut(options[choiceIndex], ": ")
 	}
 
 	return out, nil

internal/config/config.go

@@ -19,11 +19,13 @@
 package config
 
 import (
+	"context"
 	"os"
+	"sync"
 
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/loggerctx"
 )
 
 var defaultConfig = &types.Config{
@@ -33,16 +35,26 @@ var defaultConfig = &types.Config{
 	Repos: []types.Repo{
 		{
 			Name: "default",
-			URL:  "https://github.com/Elara6331/lure-repo.git",
+			URL:  "https://github.com/lure-sh/lure-repo.git",
 		},
 	},
 }
 
-var config *types.Config
+var (
+	configMtx sync.Mutex
+	config    *types.Config
+)
+
+// Config returns a LURE configuration struct.
+// The first time it's called, it'll load the config from a file.
+// Subsequent calls will just return the same value.
+func Config(ctx context.Context) *types.Config {
+	configMtx.Lock()
+	defer configMtx.Unlock()
+	log := loggerctx.From(ctx)
 
-func Config() *types.Config {
 	if config == nil {
-		cfgFl, err := os.Open(GetPaths().ConfigPath)
+		cfgFl, err := os.Open(GetPaths(ctx).ConfigPath)
 		if err != nil {
 			log.Warn("Error opening config file, using defaults").Err(err).Send()
 			return defaultConfig

internal/config/lang.go

@@ -19,19 +19,29 @@
 package config
 
 import (
+	"context"
 	"os"
 	"strings"
+	"sync"
 
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
 	"golang.org/x/text/language"
 )
 
 var (
+	langMtx sync.Mutex
 	lang    language.Tag
 	langSet bool
 )
 
-func Language() language.Tag {
+// Language returns the system language.
+// The first time it's called, it'll detect the langauge based on
+// the $LANG environment variable.
+// Subsequent calls will just return the same value.
+func Language(ctx context.Context) language.Tag {
+	langMtx.Lock()
+	defer langMtx.Unlock()
+	log := loggerctx.From(ctx)
 	if !langSet {
 		syslang := SystemLang()
 		tag, err := language.Parse(syslang)
@@ -45,6 +55,8 @@ func Language() language.Tag {
 	return lang
 }
 
+// SystemLang returns the system language based on
+// the $LANG environment variable.
 func SystemLang() string {
 	lang := os.Getenv("LANG")
 	lang, _, _ = strings.Cut(lang, ".")

internal/config/paths.go

@@ -19,13 +19,16 @@
 package config
 
 import (
+	"context"
 	"os"
 	"path/filepath"
+	"sync"
 
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
 )
 
+// Paths contains various paths used by LURE
 type Paths struct {
 	ConfigDir  string
 	ConfigPath string
@@ -35,9 +38,20 @@ type Paths struct {
 	DBPath     string
 }
 
-var paths *Paths
+var (
+	pathsMtx sync.Mutex
+	paths    *Paths
+)
 
-func GetPaths() *Paths {
+// GetPaths returns a Paths struct.
+// The first time it's called, it'll generate the struct
+// using information from the system.
+// Subsequent calls will return the same value.
+func GetPaths(ctx context.Context) *Paths {
+	pathsMtx.Lock()
+	defer pathsMtx.Unlock()
+
+	log := loggerctx.From(ctx)
 	if paths == nil {
 		paths = &Paths{}
 

internal/config/version.go

@@ -1,26 +1,5 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package config
 
-import _ "embed"
+// Version contains the version of LURE. If the version
-
+// isn't known, it'll be set to "unknown"
-//go:generate ../../scripts/gen-version.sh
+var Version = "unknown"
-
-//go:embed version.txt
-var Version string

internal/db/db.go

@@ -19,24 +19,27 @@
 package db
 
 import (
+	"context"
 	"database/sql"
 	"database/sql/driver"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
+	"sync"
 
 	"github.com/jmoiron/sqlx"
 	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
 	"golang.org/x/exp/slices"
 	"modernc.org/sqlite"
 )
 
-const CurrentVersion = 1
+// CurrentVersion is the current version of the database.
+// The database is reset if its version doesn't match this.
+const CurrentVersion = 2
 
 func init() {
-	sqlite.MustRegisterScalarFunction("json_array_contains", 2, JsonArrayContains)
+	sqlite.MustRegisterScalarFunction("json_array_contains", 2, jsonArrayContains)
 }
 
 // Package is a LURE package's database representation
@@ -55,6 +58,7 @@ type Package struct {
 	Replaces      JSON[[]string]            `sh:"replaces" db:"replaces"`
 	Depends       JSON[map[string][]string] `db:"depends"`
 	BuildDepends  JSON[map[string][]string] `db:"builddepends"`
+	OptDepends    JSON[map[string][]string] `db:"optdepends"`
 	Repository    string                    `db:"repository"`
 }
 
@@ -63,31 +67,44 @@ type version struct {
 }
 
 var (
+	mu     sync.Mutex
 	conn   *sqlx.DB
 	closed = true
 )
 
-func DB() *sqlx.DB {
+// DB returns the LURE database.
+// The first time it's called, it opens the SQLite database file.
+// Subsequent calls return the same connection.
+func DB(ctx context.Context) *sqlx.DB {
+	log := loggerctx.From(ctx)
 	if conn != nil && !closed {
-		return conn
+		return getConn()
 	}
-	db, err := Open(config.GetPaths().DBPath)
+	_, err := open(ctx, config.GetPaths(ctx).DBPath)
 	if err != nil {
 		log.Fatal("Error opening database").Err(err).Send()
 	}
-	conn = db
+	return getConn()
+}
+
+func getConn() *sqlx.DB {
+	mu.Lock()
+	defer mu.Unlock()
 	return conn
 }
 
-func Open(dsn string) (*sqlx.DB, error) {
+func open(ctx context.Context, dsn string) (*sqlx.DB, error) {
 	db, err := sqlx.Open("sqlite", dsn)
 	if err != nil {
 		return nil, err
 	}
+
+	mu.Lock()
 	conn = db
 	closed = false
+	mu.Unlock()
 
-	err = initDB(dsn)
+	err = initDB(ctx, dsn)
 	if err != nil {
 		return nil, err
 	}
@@ -95,6 +112,7 @@ func Open(dsn string) (*sqlx.DB, error) {
 	return db, nil
 }
 
+// Close closes the database
 func Close() error {
 	closed = true
 	if conn != nil {
@@ -104,10 +122,11 @@ func Close() error {
 	}
 }
 
-// Init initializes the database
+// initDB initializes the database
-func initDB(dsn string) error {
+func initDB(ctx context.Context, dsn string) error {
+	log := loggerctx.From(ctx)
 	conn = conn.Unsafe()
-	_, err := conn.Exec(`
+	_, err := conn.ExecContext(ctx, `
 		CREATE TABLE IF NOT EXISTS pkgs (
 			name          TEXT NOT NULL,
 			repository    TEXT NOT NULL,
@@ -124,6 +143,7 @@ func initDB(dsn string) error {
 			replaces      TEXT CHECK(replaces = 'null' OR (JSON_VALID(replaces) AND JSON_TYPE(replaces) = 'array')),
 			depends       TEXT CHECK(depends = 'null' OR (JSON_VALID(depends) AND JSON_TYPE(depends) = 'object')),
 			builddepends  TEXT CHECK(builddepends = 'null' OR (JSON_VALID(builddepends) AND JSON_TYPE(builddepends) = 'object')),
+			optdepends    TEXT CHECK(optdepends = 'null' OR (JSON_VALID(optdepends) AND JSON_TYPE(optdepends) = 'object')),
 			UNIQUE(name, repository)
 		);
 
@@ -135,57 +155,58 @@ func initDB(dsn string) error {
 		return err
 	}
 
-	ver, ok := GetVersion()
+	ver, ok := GetVersion(ctx)
-	if !ok {
+	if ok && ver != CurrentVersion {
+		log.Warn("Database version mismatch; resetting").Int("version", ver).Int("expected", CurrentVersion).Send()
+		reset(ctx)
+		return initDB(ctx, dsn)
+	} else if !ok {
 		log.Warn("Database version does not exist. Run lure fix if something isn't working.").Send()
-		return addVersion(CurrentVersion)
+		return addVersion(ctx, CurrentVersion)
-	}
-
-	if ver != CurrentVersion {
-		log.Warn("Database version mismatch; rebuilding").Int("version", ver).Int("expected", CurrentVersion).Send()
-
-		conn.Close()
-		err = os.Remove(config.GetPaths().DBPath)
-		if err != nil {
-			return err
-		}
-
-		tdb, err := Open(dsn)
-		if err != nil {
-			return err
-		}
-		conn = tdb
 	}
 
 	return nil
 }
 
-func IsEmpty() bool {
+// reset drops all the database tables
+func reset(ctx context.Context) error {
+	_, err := DB(ctx).ExecContext(ctx, "DROP TABLE IF EXISTS pkgs;")
+	if err != nil {
+		return err
+	}
+	_, err = DB(ctx).ExecContext(ctx, "DROP TABLE IF EXISTS lure_db_version;")
+	return err
+}
+
+// IsEmpty returns true if the database has no packages in it, otherwise it returns false.
+func IsEmpty(ctx context.Context) bool {
 	var count int
-	err := DB().Get(&count, "SELECT count(1) FROM pkgs;")
+	err := DB(ctx).GetContext(ctx, &count, "SELECT count(1) FROM pkgs;")
 	if err != nil {
 		return true
 	}
 	return count == 0
 }
 
-func GetVersion() (int, bool) {
+// GetVersion returns the database version and a boolean indicating
+// whether the database contained a version number
+func GetVersion(ctx context.Context) (int, bool) {
 	var ver version
-	err := DB().Get(&ver, "SELECT * FROM lure_db_version LIMIT 1;")
+	err := DB(ctx).GetContext(ctx, &ver, "SELECT * FROM lure_db_version LIMIT 1;")
 	if err != nil {
 		return 0, false
 	}
 	return ver.Version, true
 }
 
-func addVersion(ver int) error {
+func addVersion(ctx context.Context, ver int) error {
-	_, err := DB().Exec(`INSERT INTO lure_db_version(version) VALUES (?);`, ver)
+	_, err := DB(ctx).ExecContext(ctx, `INSERT INTO lure_db_version(version) VALUES (?);`, ver)
 	return err
 }
 
 // InsertPackage adds a package to the database
-func InsertPackage(pkg Package) error {
+func InsertPackage(ctx context.Context, pkg Package) error {
-	_, err := DB().NamedExec(`
+	_, err := DB(ctx).NamedExecContext(ctx, `
 		INSERT OR REPLACE INTO pkgs (
 			name,
 			repository,
@@ -201,7 +222,8 @@ func InsertPackage(pkg Package) error {
 			conflicts,
 			replaces,
 			depends,
-			builddepends
+			builddepends,
+			optdepends
 		) VALUES (
 			:name,
 			:repository,
@@ -217,35 +239,38 @@ func InsertPackage(pkg Package) error {
 			:conflicts,
 			:replaces,
 			:depends,
-			:builddepends
+			:builddepends,
+			:optdepends
 		);
 	`, pkg)
 	return err
 }
 
 // GetPkgs returns a result containing packages that match the where conditions
-func GetPkgs(where string, args ...any) (*sqlx.Rows, error) {
+func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
-	stream, err := DB().Queryx("SELECT * FROM pkgs WHERE "+where, args...)
+	stream, err := DB(ctx).QueryxContext(ctx, "SELECT * FROM pkgs WHERE "+where, args...)
 	if err != nil {
 		return nil, err
 	}
 	return stream, nil
 }
 
-// GetPkg returns a single package that match the where conditions
+// GetPkg returns a single package that matches the where conditions
-func GetPkg(where string, args ...any) (*Package, error) {
+func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
 	out := &Package{}
-	err := DB().Get(out, "SELECT * FROM pkgs WHERE "+where+" LIMIT 1", args...)
+	err := DB(ctx).GetContext(ctx, out, "SELECT * FROM pkgs WHERE "+where+" LIMIT 1", args...)
 	return out, err
 }
 
 // DeletePkgs deletes all packages matching the where conditions
-func DeletePkgs(where string, args ...any) error {
+func DeletePkgs(ctx context.Context, where string, args ...any) error {
-	_, err := DB().Exec("DELETE FROM pkgs WHERE "+where, args...)
+	_, err := DB(ctx).ExecContext(ctx, "DELETE FROM pkgs WHERE "+where, args...)
 	return err
 }
 
-func JsonArrayContains(ctx *sqlite.FunctionContext, args []driver.Value) (driver.Value, error) {
+// jsonArrayContains is an SQLite function that checks if a JSON array
+// in the database contains a given value
+func jsonArrayContains(ctx *sqlite.FunctionContext, args []driver.Value) (driver.Value, error) {
 	value, ok := args[0].(string)
 	if !ok {
 		return nil, errors.New("both arguments to json_array_contains must be strings")
@@ -265,10 +290,12 @@ func JsonArrayContains(ctx *sqlite.FunctionContext, args []driver.Value) (driver
 	return slices.Contains(array, item), nil
 }
 
+// JSON represents a JSON value in the database
 type JSON[T any] struct {
 	Val T
 }
 
+// NewJSON creates a new database JSON value
 func NewJSON[T any](v T) JSON[T] {
 	return JSON[T]{Val: v}
 }

internal/db/db_test.go

@@ -37,11 +37,11 @@ var testPkg = db.Package{
 		"ru": "Проверочный пакет",
 	}),
 	Homepage: db.NewJSON(map[string]string{
-		"en": "https://lure.elara.ws/",
+		"en": "https://lure.sh/",
 	}),
 	Maintainer: db.NewJSON(map[string]string{
 		"en": "Elara Musayelyan <elara@elara.ws>",
-		"ru": "Элара Мусаелян <arsen@arsenm.dev>",
+		"ru": "Элара Мусаелян <elara@elara.ws>",
 	}),
 	Architectures: db.NewJSON([]string{"arm64", "amd64"}),
 	Licenses:      db.NewJSON([]string{"GPL-3.0-or-later"}),

internal/dl/dl.go

@@ -37,7 +37,7 @@ import (
 	"github.com/PuerkitoBio/purell"
 	"github.com/vmihailenco/msgpack/v5"
 	"go.elara.ws/lure/internal/dlcache"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
 	"golang.org/x/exp/slices"
 )
 
@@ -87,6 +87,7 @@ type Options struct {
 	CacheDisabled    bool
 	PostprocDisabled bool
 	Progress         io.Writer
+	LocalDir         string
 }
 
 func (opts Options) NewHash() (hash.Hash, error) {
@@ -154,6 +155,7 @@ type UpdatingDownloader interface {
 // it downloads the source to a new cache directory and links it
 // to the destination.
 func Download(ctx context.Context, opts Options) (err error) {
+	log := loggerctx.From(ctx)
 	normalized, err := normalizeURL(opts.URL)
 	if err != nil {
 		return err
@@ -168,7 +170,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 	}
 
 	var t Type
-	cacheDir, ok := dlcache.Get(opts.URL)
+	cacheDir, ok := dlcache.Get(ctx, opts.URL)
 	if ok {
 		var updated bool
 		if d, ok := d.(UpdatingDownloader); ok {
@@ -181,6 +183,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 				URL:           opts.URL,
 				Destination:   cacheDir,
 				Progress:      opts.Progress,
+				LocalDir:      opts.LocalDir,
 			})
 			if err != nil {
 				return err
@@ -216,7 +219,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 
 	log.Info("Downloading source").Str("source", opts.Name).Str("downloader", d.Name()).Send()
 
-	cacheDir, err = dlcache.New(opts.URL)
+	cacheDir, err = dlcache.New(ctx, opts.URL)
 	if err != nil {
 		return err
 	}
@@ -228,6 +231,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 		URL:           opts.URL,
 		Destination:   cacheDir,
 		Progress:      opts.Progress,
+		LocalDir:      opts.LocalDir,
 	})
 	if err != nil {
 		return err

internal/dl/file.go

@@ -68,14 +68,34 @@ func (FileDownloader) Download(opts Options) (Type, string, error) {
 
 	u.RawQuery = query.Encode()
 
-	res, err := http.Get(u.String())
+	var r io.ReadCloser
-	if err != nil {
+	var size int64
-		return 0, "", err
+	if u.Scheme == "local" {
-	}
+		localFl, err := os.Open(filepath.Join(opts.LocalDir, u.Path))
-
+		if err != nil {
-	if name == "" {
+			return 0, "", err
-		name = getFilename(res)
+		}
+		fi, err := localFl.Stat()
+		if err != nil {
+			return 0, "", err
+		}
+		size = fi.Size()
+		if name == "" {
+			name = fi.Name()
+		}
+		r = localFl
+	} else {
+		res, err := http.Get(u.String())
+		if err != nil {
+			return 0, "", err
+		}
+		size = res.ContentLength
+		if name == "" {
+			name = getFilename(res)
+		}
+		r = res.Body
 	}
+	defer r.Close()
 
 	opts.PostprocDisabled = archive == "false"
 
@@ -89,7 +109,7 @@ func (FileDownloader) Download(opts Options) (Type, string, error) {
 	var bar io.WriteCloser
 	if opts.Progress != nil {
 		bar = progressbar.NewOptions64(
-			res.ContentLength,
+			size,
 			progressbar.OptionSetDescription(name),
 			progressbar.OptionSetWriter(opts.Progress),
 			progressbar.OptionShowBytes(true),
@@ -120,11 +140,11 @@ func (FileDownloader) Download(opts Options) (Type, string, error) {
 		w = io.MultiWriter(fl, bar)
 	}
 
-	_, err = io.Copy(w, res.Body)
+	_, err = io.Copy(w, r)
 	if err != nil {
 		return 0, "", err
 	}
-	res.Body.Close()
+	r.Close()
 
 	if opts.Hash != nil {
 		sum := h.Sum(nil)
@@ -142,14 +162,14 @@ func (FileDownloader) Download(opts Options) (Type, string, error) {
 		return 0, "", err
 	}
 
-	format, r, err := archiver.Identify(name, fl)
+	format, ar, err := archiver.Identify(name, fl)
 	if err == archiver.ErrNoMatch {
 		return TypeFile, name, nil
 	} else if err != nil {
 		return 0, "", err
 	}
 
-	err = extractFile(r, format, name, opts)
+	err = extractFile(ar, format, name, opts)
 	if err != nil {
 		return 0, "", err
 	}
@@ -227,7 +247,7 @@ func extractFile(r io.Reader, format archiver.Format, name string, opts Options)
 	return nil
 }
 
-var cdHeaderRgx = regexp.MustCompile(`filename="(.+)"`)
+var cdHeaderRgx = regexp.MustCompile(`filename="?(.+)"?`)
 
 // getFilename attempts to parse the Content-Disposition
 // HTTP response header and extract a filename. If the

internal/dlcache/dlcache.go

@@ -19,6 +19,7 @@
 package dlcache
 
 import (
+	"context"
 	"crypto/sha1"
 	"encoding/hex"
 	"io"
@@ -29,19 +30,19 @@ import (
 )
 
 // BasePath returns the base path of the download cache
-func BasePath() string {
+func BasePath(ctx context.Context) string {
-	return filepath.Join(config.GetPaths().RepoDir, "dl")
+	return filepath.Join(config.GetPaths(ctx).CacheDir, "dl")
 }
 
 // New creates a new directory with the given ID in the cache.
 // If a directory with the same ID already exists,
 // it will be deleted before creating a new one.
-func New(id string) (string, error) {
+func New(ctx context.Context, id string) (string, error) {
 	h, err := hashID(id)
 	if err != nil {
 		return "", err
 	}
-	itemPath := filepath.Join(BasePath(), h)
+	itemPath := filepath.Join(BasePath(ctx), h)
 
 	fi, err := os.Stat(itemPath)
 	if err == nil || (fi != nil && !fi.IsDir()) {
@@ -64,12 +65,12 @@ func New(id string) (string, error) {
 // returns the directory and true. If it
 // does not exist, it returns an empty string
 // and false.
-func Get(id string) (string, bool) {
+func Get(ctx context.Context, id string) (string, bool) {
 	h, err := hashID(id)
 	if err != nil {
 		return "", false
 	}
-	itemPath := filepath.Join(BasePath(), h)
+	itemPath := filepath.Join(BasePath(ctx), h)
 
 	_, err = os.Stat(itemPath)
 	if err != nil {

internal/dlcache/dlcache_test.go

@@ -19,6 +19,7 @@
 package dlcache_test
 
 import (
+	"context"
 	"crypto/sha1"
 	"encoding/hex"
 	"io"
@@ -35,7 +36,7 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	config.GetPaths().RepoDir = dir
+	config.GetPaths(context.Background()).RepoDir = dir
 }
 
 func TestNew(t *testing.T) {

internal/log/log.go

@@ -1,102 +0,0 @@
-/*
- * LURE - Linux User REpository
- * Copyright (C) 2023 Elara Musayelyan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package log
-
-import (
-	"os"
-
-	"go.elara.ws/logger"
-)
-
-var Logger logger.Logger = logger.NewCLI(os.Stderr)
-
-// NoPanic prevents the logger from panicking on panic events
-func NoPanic() {
-	Logger.NoPanic()
-}
-
-// NoExit prevents the logger from exiting on fatal events
-func NoExit() {
-	Logger.NoExit()
-}
-
-// SetLevel sets the log level of the logger
-func SetLevel(l logger.LogLevel) {
-	Logger.SetLevel(l)
-}
-
-// Debug creates a new debug event with the given message
-func Debug(msg string) logger.LogBuilder {
-	return Logger.Debug(msg)
-}
-
-// Debugf creates a new debug event with the formatted message
-func Debugf(format string, v ...any) logger.LogBuilder {
-	return Logger.Debugf(format, v...)
-}
-
-// Info creates a new info event with the given message
-func Info(msg string) logger.LogBuilder {
-	return Logger.Info(msg)
-}
-
-// Infof creates a new info event with the formatted message
-func Infof(format string, v ...any) logger.LogBuilder {
-	return Logger.Infof(format, v...)
-}
-
-// Warn creates a new warn event with the given message
-func Warn(msg string) logger.LogBuilder {
-	return Logger.Warn(msg)
-}
-
-// Warnf creates a new warn event with the formatted message
-func Warnf(format string, v ...any) logger.LogBuilder {
-	return Logger.Warnf(format, v...)
-}
-
-// Error creates a new error event with the given message
-func Error(msg string) logger.LogBuilder {
-	return Logger.Error(msg)
-}
-
-// Errorf creates a new error event with the formatted message
-func Errorf(format string, v ...any) logger.LogBuilder {
-	return Logger.Errorf(format, v...)
-}
-
-// Fatal creates a new fatal event with the given message
-func Fatal(msg string) logger.LogBuilder {
-	return Logger.Fatal(msg)
-}
-
-// Fatalf creates a new fatal event with the formatted message
-func Fatalf(format string, v ...any) logger.LogBuilder {
-	return Logger.Fatalf(format, v...)
-}
-
-// Fatal creates a new fatal event with the given message
-func Panic(msg string) logger.LogBuilder {
-	return Logger.Panic(msg)
-}
-
-// Fatalf creates a new fatal event with the formatted message
-func Panicf(format string, v ...any) logger.LogBuilder {
-	return Logger.Panicf(format, v...)
-}

internal/overrides/overrides.go

@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"strings"
 
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/cpu"
 	"go.elara.ws/lure/internal/db"
+	"go.elara.ws/lure/pkg/distro"
 	"golang.org/x/exp/slices"
 	"golang.org/x/text/language"
 )
@@ -163,6 +163,7 @@ type ResolvedPackage struct {
 	Replaces      []string `sh:"replaces"`
 	Depends       []string `sh:"deps"`
 	BuildDepends  []string `sh:"build_deps"`
+	OptDepends    []string `sh:"opt_deps"`
 }
 
 func ResolvePackage(pkg *db.Package, overrides []string) *ResolvedPackage {

internal/overrides/overrides_test.go

@@ -23,8 +23,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/overrides"
+	"go.elara.ws/lure/pkg/distro"
 	"golang.org/x/text/language"
 )
 

internal/pager/pager.go

@@ -60,6 +60,7 @@ func (p *Pager) Run() error {
 	prog := tea.NewProgram(
 		p.model,
 		tea.WithMouseCellMotion(),
+		tea.WithAltScreen(),
 	)
 
 	_, err := prog.Run()
@@ -74,7 +75,7 @@ type pagerModel struct {
 }
 
 func (pm pagerModel) Init() tea.Cmd {
-	return tea.ClearScreen
+	return nil
 }
 
 func (pm pagerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

internal/shutils/decoder/decoder.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	"github.com/mitchellh/mapstructure"
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/overrides"
+	"go.elara.ws/lure/pkg/distro"
 	"golang.org/x/exp/slices"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"

internal/shutils/decoder/decoder_test.go

@@ -27,8 +27,8 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/shutils/decoder"
+	"go.elara.ws/lure/pkg/distro"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 )

internal/shutils/exec_test.go

@@ -23,9 +23,9 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/shutils"
 	"go.elara.ws/lure/internal/shutils/decoder"
+	"go.elara.ws/lure/pkg/distro"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 )
@@ -36,7 +36,7 @@ const testScript = `
 	release=1
 	epoch=2
 	desc="Test package"
-	homepage='https://lure.elara.ws'
+	homepage='https://lure.sh'
 	maintainer='Elara Musayelyan <elara@elara.ws>'
 	architectures=('arm64' 'amd64')
 	license=('GPL-3.0-or-later')

internal/translations/translations.go

@@ -19,10 +19,12 @@
 package translations
 
 import (
+	"context"
 	"embed"
+	"sync"
 
 	"go.elara.ws/logger"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
 	"go.elara.ws/translate"
 	"golang.org/x/text/language"
 )
@@ -30,9 +32,15 @@ import (
 //go:embed files
 var translationFS embed.FS
 
-var translator *translate.Translator
+var (
+	mu         sync.Mutex
+	translator *translate.Translator
+)
 
-func Translator() *translate.Translator {
+func Translator(ctx context.Context) *translate.Translator {
+	mu.Lock()
+	defer mu.Unlock()
+	log := loggerctx.From(ctx)
 	if translator == nil {
 		t, err := translate.NewFromFS(translationFS)
 		if err != nil {
@@ -43,6 +51,6 @@ func Translator() *translate.Translator {
 	return translator
 }
 
-func NewLogger(l logger.Logger, lang language.Tag) *translate.TranslatedLogger {
+func NewLogger(ctx context.Context, l logger.Logger, lang language.Tag) *translate.TranslatedLogger {
-	return translate.NewLogger(l, *Translator(), lang)
+	return translate.NewLogger(l, *Translator(ctx), lang)
 }

internal/types/build.go

@@ -18,7 +18,7 @@
 
 package types
 
-import "go.elara.ws/lure/manager"
+import "go.elara.ws/lure/pkg/manager"
 
 type BuildOpts struct {
 	Script      string
@@ -43,6 +43,7 @@ type BuildVars struct {
 	Conflicts     []string `sh:"conflicts"`
 	Depends       []string `sh:"deps"`
 	BuildDepends  []string `sh:"build_deps"`
+	OptDepends    []string `sh:"opt_deps"`
 	Replaces      []string `sh:"replaces"`
 	Sources       []string `sh:"sources"`
 	Checksums     []string `sh:"checksums"`

list.go

@@ -24,9 +24,9 @@ import (
 	"github.com/urfave/cli/v2"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
+	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/internal/repos"
+	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/repos"
 	"golang.org/x/exp/slices"
 )
 
@@ -41,7 +41,10 @@ var listCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
-		err := repos.Pull(c.Context, config.Config().Repos)
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repositories").Err(err).Send()
 		}
@@ -53,7 +56,7 @@ var listCmd = &cli.Command{
 			args = []any{c.Args().First(), c.Args().First()}
 		}
 
-		result, err := db.GetPkgs(where, args...)
+		result, err := db.GetPkgs(ctx, where, args...)
 		if err != nil {
 			log.Fatal("Error getting packages").Err(err).Send()
 		}
@@ -79,7 +82,7 @@ var listCmd = &cli.Command{
 				return err
 			}
 
-			if slices.Contains(config.Config().IgnorePkgUpdates, pkg.Name) {
+			if slices.Contains(config.Config(ctx).IgnorePkgUpdates, pkg.Name) {
 				continue
 			}
 

main.go

@@ -30,9 +30,9 @@ import (
 	"go.elara.ws/logger"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/translations"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/manager"
 )
 
 var app = &cli.App{
@@ -88,16 +88,17 @@ var versionCmd = &cli.Command{
 }
 
 func main() {
-	log.Logger = translations.NewLogger(logger.NewCLI(os.Stderr), config.Language())
+	ctx := context.Background()
+	log := translations.NewLogger(ctx, logger.NewCLI(os.Stderr), config.Language(ctx))
+	ctx = loggerctx.With(ctx, log)
 
-	if !config.Config().Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
+	if !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
 		log.Fatal("Running LURE as root is forbidden as it may cause catastrophic damage to your system").Send()
 	}
 
 	// Set the root command to the one set in the LURE config
-	manager.DefaultRootCmd = config.Config().RootCmd
+	manager.DefaultRootCmd = config.Config(ctx).RootCmd
 
-	ctx := context.Background()
 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 

pkg/build/build.go

@@ -38,19 +38,19 @@ import (
 
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/goreleaser/nfpm/v2/files"
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/cliutils"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/cpu"
 	"go.elara.ws/lure/internal/db"
 	"go.elara.ws/lure/internal/dl"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/shutils"
 	"go.elara.ws/lure/internal/shutils/decoder"
 	"go.elara.ws/lure/internal/shutils/helpers"
 	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/distro"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/manager"
+	"go.elara.ws/lure/pkg/repos"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
@@ -59,6 +59,8 @@ import (
 // BuildPackage builds the script at the given path. It returns two slices. One contains the paths
 // to the built package(s), the other contains the names of the built package(s).
 func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string, error) {
+	log := loggerctx.From(ctx)
+
 	info, err := distro.ParseOSRelease(ctx)
 	if err != nil {
 		return nil, nil, err
@@ -69,13 +71,18 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
+	// The first pass is just used to get variable values and runs before
+	// the script is displayed, so it's restricted so as to prevent malicious
+	// code from executing.
 	vars, err := executeFirstPass(ctx, info, fl, opts.Script)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	dirs := getDirs(vars, opts.Script)
+	dirs := getDirs(ctx, vars, opts.Script)
 
+	// If opts.Clean isn't set and we find the package already built,
+	// just return it rather than rebuilding
 	if !opts.Clean {
 		builtPkgPath, ok, err := checkForBuiltPackage(opts.Manager, vars, getPkgFormat(opts.Manager), dirs.BaseDir)
 		if err != nil {
@@ -87,30 +94,36 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		}
 	}
 
-	err = cliutils.PromptViewScript(opts.Script, vars.Name, config.Config().PagerStyle, opts.Interactive)
+	// Ask the user if they'd like to see the build script
+	err = cliutils.PromptViewScript(ctx, opts.Script, vars.Name, config.Config(ctx).PagerStyle, opts.Interactive)
 	if err != nil {
 		log.Fatal("Failed to prompt user to view build script").Err(err).Send()
 	}
 
 	log.Info("Building package").Str("name", vars.Name).Str("version", vars.Version).Send()
 
+	// The second pass will be used to execute the actual code,
+	// so it's unrestricted. The script has already been displayed
+	// to the user by this point, so it should be safe
 	dec, err := executeSecondPass(ctx, info, fl, dirs)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	// Get the installed packages on the system
 	installed, err := opts.Manager.ListInstalled(nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	cont, err := performChecks(vars, opts.Interactive, installed)
+	cont, err := performChecks(ctx, vars, opts.Interactive, installed)
 	if err != nil {
 		return nil, nil, err
 	} else if !cont {
 		os.Exit(1)
 	}
 
+	// Prepare the directories for building
 	err = prepareDirs(dirs)
 	if err != nil {
 		return nil, nil, err
@@ -121,14 +134,19 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
-	builtPaths, builtNames, repoDeps, err := installDeps(ctx, opts, vars)
+	err = installOptDeps(ctx, vars, opts, installed)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	builtPaths, builtNames, repoDeps, err := buildLUREDeps(ctx, opts, vars)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	log.Info("Downloading sources").Send()
 
-	err = getSources(ctx, dirs.SrcDir, vars)
+	err = getSources(ctx, dirs, vars)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -165,7 +183,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
-	err = removeBuildDeps(buildDeps, opts)
+	err = removeBuildDeps(ctx, buildDeps, opts)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -175,12 +193,16 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 	pkgPaths := append(builtPaths, pkgPath)
 	pkgNames := append(builtNames, vars.Name)
 
+	// Remove any duplicates from the pkgPaths and pkgNames.
+	// Duplicates can be introduced if several of the dependencies
+	// depend on the same packages.
 	pkgPaths = removeDuplicates(pkgPaths)
 	pkgNames = removeDuplicates(pkgNames)
 
 	return pkgPaths, pkgNames, nil
 }
 
+// parseScript parses the build script using the built-in bash implementation
 func parseScript(info *distro.OSRelease, script string) (*syntax.File, error) {
 	fl, err := os.Open(script)
 	if err != nil {
@@ -196,13 +218,12 @@ func parseScript(info *distro.OSRelease, script string) (*syntax.File, error) {
 	return file, nil
 }
 
+// executeFirstPass executes the parsed script in a restricted environment
+// to extract the build variables without executing any actual code.
 func executeFirstPass(ctx context.Context, info *distro.OSRelease, fl *syntax.File, script string) (*types.BuildVars, error) {
 	scriptDir := filepath.Dir(script)
 	env := createBuildEnvVars(info, types.Directories{ScriptDir: scriptDir})
 
-	// The first pass is just used to get variable values and runs before
-	// the script is displayed, so it is restricted so as to prevent malicious
-	// code from executing.
 	runner, err := interp.New(
 		interp.Env(expand.ListEnviron(env...)),
 		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),
@@ -231,8 +252,9 @@ func executeFirstPass(ctx context.Context, info *distro.OSRelease, fl *syntax.Fi
 	return &vars, nil
 }
 
-func getDirs(vars *types.BuildVars, script string) types.Directories {
+// getDirs returns the appropriate directories for the script
-	baseDir := filepath.Join(config.GetPaths().PkgsDir, vars.Name)
+func getDirs(ctx context.Context, vars *types.BuildVars, script string) types.Directories {
+	baseDir := filepath.Join(config.GetPaths(ctx).PkgsDir, vars.Name)
 	return types.Directories{
 		BaseDir:   baseDir,
 		SrcDir:    filepath.Join(baseDir, "src"),
@@ -241,11 +263,11 @@ func getDirs(vars *types.BuildVars, script string) types.Directories {
 	}
 }
 
+// executeSecondPass executes the build script for the second time, this time without any restrictions.
+// It returns a decoder that can be used to retrieve functions and variables from the script.
 func executeSecondPass(ctx context.Context, info *distro.OSRelease, fl *syntax.File, dirs types.Directories) (*decoder.Decoder, error) {
 	env := createBuildEnvVars(info, dirs)
-	// The second pass will be used to execute the actual functions,
+
-	// so it cannot be restricted. The script has already been displayed
-	// to the user by this point, so it should be safe
 	runner, err := interp.New(
 		interp.Env(expand.ListEnviron(env...)),
 		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),
@@ -263,6 +285,7 @@ func executeSecondPass(ctx context.Context, info *distro.OSRelease, fl *syntax.F
 	return decoder.New(info, runner), nil
 }
 
+// prepareDirs prepares the directories for building.
 func prepareDirs(dirs types.Directories) error {
 	err := os.RemoveAll(dirs.BaseDir)
 	if err != nil {
@@ -275,9 +298,11 @@ func prepareDirs(dirs types.Directories) error {
 	return os.MkdirAll(dirs.PkgDir, 0o755)
 }
 
-func performChecks(vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) {
+// performChecks checks various things on the system to ensure that the package can be installed.
+func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) {
+	log := loggerctx.From(ctx)
 	if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) {
-		cont, err := cliutils.YesNoPrompt("Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true)
+		cont, err := cliutils.YesNoPrompt(ctx, "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true)
 		if err != nil {
 			return false, err
 		}
@@ -297,38 +322,70 @@ func performChecks(vars *types.BuildVars, interactive bool, installed map[string
 	return true, nil
 }
 
+// installBuildDeps installs any build dependencies that aren't already installed and returns
+// a slice containing the names of all the packages it installed.
 func installBuildDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) ([]string, error) {
+	log := loggerctx.From(ctx)
 	var buildDeps []string
 	if len(vars.BuildDepends) > 0 {
-		found, notFound, err := repos.FindPkgs(vars.BuildDepends)
+		found, notFound, err := repos.FindPkgs(ctx, vars.BuildDepends)
 		if err != nil {
 			return nil, err
 		}
 
-		found = filterBuildDeps(found, installed)
+		found = removeAlreadyInstalled(found, installed)
 
 		log.Info("Installing build dependencies").Send()
 
-		flattened := cliutils.FlattenPkgs(found, "install", opts.Interactive)
+		flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
 		buildDeps = packageNames(flattened)
 		InstallPkgs(ctx, flattened, notFound, opts)
 	}
 	return buildDeps, nil
 }
 
-func installDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) {
+// installOptDeps asks the user which, if any, optional dependencies they want to install.
+// If the user chooses to install any optional dependencies, it performs the installation.
+func installOptDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) error {
+	if len(vars.OptDepends) > 0 {
+		optDeps, err := cliutils.ChooseOptDepends(ctx, vars.OptDepends, "install", opts.Interactive)
+		if err != nil {
+			return err
+		}
+
+		if len(optDeps) == 0 {
+			return nil
+		}
+
+		found, notFound, err := repos.FindPkgs(ctx, optDeps)
+		if err != nil {
+			return err
+		}
+
+		found = removeAlreadyInstalled(found, installed)
+		flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
+		InstallPkgs(ctx, flattened, notFound, opts)
+	}
+	return nil
+}
+
+// buildLUREDeps builds all the LURE dependencies of the package. It returns the paths and names
+// of the packages it built, as well as all the dependencies it didn't find in the LURE repo so
+// they can be installed from the system repos.
+func buildLUREDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) {
+	log := loggerctx.From(ctx)
 	if len(vars.Depends) > 0 {
 		log.Info("Installing dependencies").Send()
 
-		found, notFound, err := repos.FindPkgs(vars.Depends)
+		found, notFound, err := repos.FindPkgs(ctx, vars.Depends)
 		if err != nil {
 			return nil, nil, nil, err
 		}
 		repoDeps = notFound
 
 		// If there are multiple options for some packages, flatten them all into a single slice
-		pkgs := cliutils.FlattenPkgs(found, "install", opts.Interactive)
+		pkgs := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
-		scripts := GetScriptPaths(pkgs)
+		scripts := GetScriptPaths(ctx, pkgs)
 		for _, script := range scripts {
 			newOpts := opts
 			newOpts.Script = script
@@ -348,13 +405,17 @@ func installDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVar
 		}
 	}
 
+	// Remove any potential duplicates, which can be introduced if
+	// several of the dependencies depend on the same packages.
 	repoDeps = removeDuplicates(repoDeps)
 	builtPaths = removeDuplicates(builtPaths)
 	builtNames = removeDuplicates(builtNames)
 	return builtPaths, builtNames, repoDeps, nil
 }
 
+// executeFunctions executes the special LURE functions, such as version(), prepare(), etc.
 func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (err error) {
+	log := loggerctx.From(ctx)
 	version, ok := dec.GetFunc("version")
 	if ok {
 		log.Info("Executing version()").Send()
@@ -415,6 +476,7 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
 	return nil
 }
 
+// buildPkgMetadata builds the metadata for the package that's going to be built.
 func buildPkgMetadata(vars *types.BuildVars, dirs types.Directories, deps []string) (*nfpm.Info, error) {
 	pkgInfo := &nfpm.Info{
 		Name:        vars.Name,
@@ -453,6 +515,8 @@ func buildPkgMetadata(vars *types.BuildVars, dirs types.Directories, deps []stri
 	return pkgInfo, nil
 }
 
+// buildContents builds the contents section of the package, which contains the files
+// that will be placed into the final package.
 func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Content, error) {
 	contents := []*files.Content{}
 	err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
@@ -464,6 +528,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
 				return err
 			}
 
+			// If the directory is empty, skip it
 			_, err = f.Readdirnames(1)
 			if err != io.EOF {
 				return nil
@@ -478,8 +543,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
 				},
 			})
 
-			f.Close()
+			return f.Close()
-			return nil
 		}
 
 		if fi.Mode()&os.ModeSymlink != 0 {
@@ -487,6 +551,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
 			if err != nil {
 				return err
 			}
+			// Remove pkgdir from the symlink's path
 			link = strings.TrimPrefix(link, dirs.PkgDir)
 
 			contents = append(contents, &files.Content{
@@ -512,6 +577,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
 			},
 		}
 
+		// If the file is supposed to be backed up, set its type to config|noreplace
 		if slices.Contains(vars.Backup, trimmed) {
 			fileContent.Type = "config|noreplace"
 		}
@@ -523,14 +589,16 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
 	return contents, err
 }
 
-func removeBuildDeps(buildDeps []string, opts types.BuildOpts) error {
+// removeBuildDeps asks the user if they'd like to remove the build dependencies that were
+// installed by installBuildDeps. If so, it uses the package manager to do that.
+func removeBuildDeps(ctx context.Context, buildDeps []string, opts types.BuildOpts) error {
 	if len(buildDeps) > 0 {
-		removeBuildDeps, err := cliutils.YesNoPrompt("Would you like to remove the build dependencies?", opts.Interactive, false)
+		remove, err := cliutils.YesNoPrompt(ctx, "Would you like to remove the build dependencies?", opts.Interactive, false)
 		if err != nil {
 			return err
 		}
 
-		if removeBuildDeps {
+		if remove {
 			err = opts.Manager.Remove(
 				&manager.Opts{
 					AsRoot:    true,
@@ -546,6 +614,8 @@ func removeBuildDeps(buildDeps []string, opts types.BuildOpts) error {
 	return nil
 }
 
+// checkForBuiltPackage tries to detect a previously-built package and returns its path
+// and true if it finds one. If it doesn't find it, it returns "", false, nil.
 func checkForBuiltPackage(mgr manager.Manager, vars *types.BuildVars, pkgFormat, baseDir string) (string, bool, error) {
 	filename, err := pkgFileName(vars, pkgFormat)
 	if err != nil {
@@ -562,6 +632,8 @@ func checkForBuiltPackage(mgr manager.Manager, vars *types.BuildVars, pkgFormat,
 	return pkgPath, true, nil
 }
 
+// pkgFileName returns the filename of the package if it were to be built.
+// This is used to check if the package has already been built.
 func pkgFileName(vars *types.BuildVars, pkgFormat string) (string, error) {
 	pkgInfo := &nfpm.Info{
 		Name:    vars.Name,
@@ -579,6 +651,8 @@ func pkgFileName(vars *types.BuildVars, pkgFormat string) (string, error) {
 	return packager.ConventionalFileName(pkgInfo), nil
 }
 
+// getPkgFormat returns the package format of the package manager,
+// or LURE_PKG_FORMAT if that's set.
 func getPkgFormat(mgr manager.Manager) string {
 	pkgFormat := mgr.Format()
 	if format, ok := os.LookupEnv("LURE_PKG_FORMAT"); ok {
@@ -587,6 +661,8 @@ func getPkgFormat(mgr manager.Manager) string {
 	return pkgFormat
 }
 
+// createBuildEnvVars creates the environment variables that will be set in the
+// build script when it's executed.
 func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string {
 	env := os.Environ()
 
@@ -616,7 +692,9 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string
 	return env
 }
 
-func getSources(ctx context.Context, srcdir string, bv *types.BuildVars) error {
+// getSources downloads the sources from the script.
+func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars) error {
+	log := loggerctx.From(ctx)
 	if len(bv.Sources) != len(bv.Checksums) {
 		log.Fatal("The checksums array must be the same length as sources").Send()
 	}
@@ -625,11 +703,17 @@ func getSources(ctx context.Context, srcdir string, bv *types.BuildVars) error {
 		opts := dl.Options{
 			Name:        fmt.Sprintf("%s[%d]", bv.Name, i),
 			URL:         src,
-			Destination: srcdir,
+			Destination: dirs.SrcDir,
 			Progress:    os.Stderr,
+			LocalDir:    dirs.ScriptDir,
 		}
 
+		println("ld", opts.LocalDir)
+
 		if !strings.EqualFold(bv.Checksums[i], "SKIP") {
+			// If the checksum contains a colon, use the part before the colon
+			// as the algorithm and the part after as the actual checksum.
+			// Otherwise, use the default sha256 with the whole string as the checksum.
 			algo, hashData, ok := strings.Cut(bv.Checksums[i], ":")
 			if ok {
 				checksum, err := hex.DecodeString(hashData)
@@ -656,6 +740,7 @@ func getSources(ctx context.Context, srcdir string, bv *types.BuildVars) error {
 	return nil
 }
 
+// setScripts adds any hook scripts to the package metadata.
 func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
 	if vars.Scripts.PreInstall != "" {
 		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.PreInstall)
@@ -692,6 +777,8 @@ func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
 	}
 }
 
+// setVersion changes the version variable in the script runner.
+// It's used to set the version to the output of the version() function.
 func setVersion(ctx context.Context, r *interp.Runner, to string) error {
 	fl, err := syntax.NewParser().Parse(strings.NewReader("version='"+to+"'"), "")
 	if err != nil {
@@ -700,34 +787,24 @@ func setVersion(ctx context.Context, r *interp.Runner, to string) error {
 	return r.Run(ctx, fl)
 }
 
-// filterBuildDeps returns a map without any dependencies that are already installed
+// removeAlreadyInstalled returns a map without any dependencies that are already installed
-func filterBuildDeps(found map[string][]db.Package, installed map[string]string) map[string][]db.Package {
+func removeAlreadyInstalled(found map[string][]db.Package, installed map[string]string) map[string][]db.Package {
-	out := map[string][]db.Package{}
+	filteredPackages := make(map[string][]db.Package)
-	for name, pkgs := range found {
-		var inner []db.Package
-		for _, pkg := range pkgs {
-			if _, ok := installed[pkg.Name]; !ok {
-				addToFiltered := true
-				for _, provides := range pkg.Provides.Val {
-					if _, ok := installed[provides]; ok {
-						addToFiltered = false
-						break
-					}
-				}
 
-				if addToFiltered {
+	for name, pkgList := range found {
-					inner = append(inner, pkg)
+		filteredPkgList := []db.Package{}
-				}
+		for _, pkg := range pkgList {
+			if _, isInstalled := installed[pkg.Name]; !isInstalled {
+				filteredPkgList = append(filteredPkgList, pkg)
 			}
 		}
-
+		filteredPackages[name] = filteredPkgList
-		if len(inner) > 0 {
-			out[name] = inner
-		}
 	}
-	return out
+
+	return filteredPackages
 }
 
+// packageNames returns the names of all the given packages
 func packageNames(pkgs []db.Package) []string {
 	names := make([]string, len(pkgs))
 	for i, p := range pkgs {
@@ -736,6 +813,7 @@ func packageNames(pkgs []db.Package) []string {
 	return names
 }
 
+// removeDuplicates removes any duplicates from the given slice
 func removeDuplicates(slice []string) []string {
 	seen := map[string]struct{}{}
 	result := []string{}

pkg/build/install.go

@@ -24,13 +24,15 @@ import (
 
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/loggerctx"
 )
 
-// InstallPkgs installs non-LURE packages via the package manager, then builds and installs LURE
+// InstallPkgs installs native packages via the package manager,
-// packages
+// then builds and installs the LURE packages
 func InstallPkgs(ctx context.Context, lurePkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
+	log := loggerctx.From(ctx)
+
 	if len(nativePkgs) > 0 {
 		err := opts.Manager.Install(nil, nativePkgs...)
 		if err != nil {
@@ -38,22 +40,23 @@ func InstallPkgs(ctx context.Context, lurePkgs []db.Package, nativePkgs []string
 		}
 	}
 
-	InstallScripts(ctx, GetScriptPaths(lurePkgs), opts)
+	InstallScripts(ctx, GetScriptPaths(ctx, lurePkgs), opts)
 }
 
-// GetScriptPaths generates a slice of script paths corresponding to the
+// GetScriptPaths returns a slice of script paths corresponding to the
 // given packages
-func GetScriptPaths(pkgs []db.Package) []string {
+func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
 	var scripts []string
 	for _, pkg := range pkgs {
-		scriptPath := filepath.Join(config.GetPaths().RepoDir, pkg.Repository, pkg.Name, "lure.sh")
+		scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, pkg.Repository, pkg.Name, "lure.sh")
 		scripts = append(scripts, scriptPath)
 	}
 	return scripts
 }
 
-// InstallScripts builds and installs LURE build scripts
+// InstallScripts builds and installs the given LURE build scripts
 func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
+	log := loggerctx.From(ctx)
 	for _, script := range scripts {
 		opts.Script = script
 		builtPkgs, _, err := BuildPackage(ctx, opts)

pkg/distro/osrelease.go

@@ -20,7 +20,6 @@ package distro
 
 import (
 	"context"
-	"errors"
 	"os"
 	"strings"
 
@@ -30,8 +29,7 @@ import (
 	"mvdan.cc/sh/v3/syntax"
 )
 
-var ErrParse = errors.New("could not parse os-release file")
+// OSRelease contains information from an os-release file
-
 type OSRelease struct {
 	Name             string
 	PrettyName       string
@@ -50,7 +48,8 @@ var parsed *OSRelease
 
 // OSReleaseName returns a struct parsed from the system's os-release
 // file. It checks /etc/os-release as well as /usr/lib/os-release.
-// The returned OSRelease struct is a singleton.
+// The first time it's called, it'll parse the os-release file.
+// Subsequent calls will return the same value.
 func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
 	if parsed != nil {
 		return parsed, nil
@@ -87,7 +86,7 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
 
 	err = runner.Run(ctx, file)
 	if err != nil {
-		return nil, ErrParse
+		return nil, err
 	}
 
 	out := &OSRelease{

pkg/loggerctx/log.go

@@ -0,0 +1,29 @@
+package loggerctx
+
+import (
+	"context"
+
+	"go.elara.ws/logger"
+)
+
+// loggerCtxKey is used as the context key for loggers
+type loggerCtxKey struct{}
+
+// With returns a copy of ctx containing log
+func With(ctx context.Context, log logger.Logger) context.Context {
+	return context.WithValue(ctx, loggerCtxKey{}, log)
+}
+
+// From attempts to get a logger from ctx. If ctx doesn't
+// contain a logger, it returns a nop logger.
+func From(ctx context.Context) logger.Logger {
+	if val := ctx.Value(loggerCtxKey{}); val != nil {
+		if log, ok := val.(logger.Logger); ok && log != nil {
+			return log
+		} else {
+			return logger.NewNop()
+		}
+	} else {
+		return logger.NewNop()
+	}
+}

pkg/repos/find.go

@@ -18,12 +18,16 @@
 
 package repos
 
-import "go.elara.ws/lure/internal/db"
+import (
+	"context"
+
+	"go.elara.ws/lure/internal/db"
+)
 
 // FindPkgs looks for packages matching the inputs inside the database.
-// It returns a map that maps the package name input to the packages found for it.
+// It returns a map that maps the package name input to any packages found for it.
 // It also returns a slice that contains the names of all packages that were not found.
-func FindPkgs(pkgs []string) (map[string][]db.Package, []string, error) {
+func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
 	found := map[string][]db.Package{}
 	notFound := []string(nil)
 
@@ -32,7 +36,7 @@ func FindPkgs(pkgs []string) (map[string][]db.Package, []string, error) {
 			continue
 		}
 
-		result, err := db.GetPkgs("name LIKE ?", pkgName)
+		result, err := db.GetPkgs(ctx, "name LIKE ?", pkgName)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -51,7 +55,7 @@ func FindPkgs(pkgs []string) (map[string][]db.Package, []string, error) {
 		result.Close()
 
 		if added == 0 {
-			result, err := db.GetPkgs("json_array_contains(provides, ?)", pkgName)
+			result, err := db.GetPkgs(ctx, "json_array_contains(provides, ?)", pkgName)
 			if err != nil {
 				return nil, nil, err
 			}

pkg/repos/find_test.go

@@ -25,8 +25,8 @@ import (
 	"testing"
 
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/repos"
 )
 
 func TestFindPkgs(t *testing.T) {

pkg/repos/pull.go

@@ -34,13 +34,13 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/format/diff"
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/distro"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
 	"go.elara.ws/lure/internal/shutils"
 	"go.elara.ws/lure/internal/shutils/decoder"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/distro"
+	"go.elara.ws/lure/pkg/loggerctx"
 	"go.elara.ws/vercmp"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
@@ -49,8 +49,15 @@ import (
 
 // Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
 // and its packages will be written to the DB. If it does exist, it will be pulled.
-// In this case, only changed packages will be processed.
+// In this case, only changed packages will be processed if possible.
+// If repos is set to nil, the repos in the LURE config will be used.
 func Pull(ctx context.Context, repos []types.Repo) error {
+	log := loggerctx.From(ctx)
+
+	if repos == nil {
+		repos = config.Config(ctx).Repos
+	}
+
 	for _, repo := range repos {
 		repoURL, err := url.Parse(repo.URL)
 		if err != nil {
@@ -58,7 +65,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
 		}
 
 		log.Info("Pulling repository").Str("name", repo.Name).Send()
-		repoDir := filepath.Join(config.GetPaths().RepoDir, repo.Name)
+		repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name)
 
 		var repoFS billy.Filesystem
 		gitDir := filepath.Join(repoDir, ".git")
@@ -88,7 +95,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
 			repoFS = w.Filesystem
 
 			// Make sure the DB is created even if the repo is up to date
-			if !errors.Is(err, git.NoErrAlreadyUpToDate) || db.IsEmpty() {
+			if !errors.Is(err, git.NoErrAlreadyUpToDate) || db.IsEmpty(ctx) {
 				new, err := r.Head()
 				if err != nil {
 					return err
@@ -97,13 +104,13 @@ func Pull(ctx context.Context, repos []types.Repo) error {
 				// If the DB was not present at startup, that means it's
 				// empty. In this case, we need to update the DB fully
 				// rather than just incrementally.
-				if db.IsEmpty() {
+				if db.IsEmpty(ctx) {
-					err = processRepoChanges(ctx, repo, r, w, old, new)
+					err = processRepoFull(ctx, repo, repoDir)
 					if err != nil {
 						return err
 					}
 				} else {
-					err = processRepoFull(ctx, repo, repoDir)
+					err = processRepoChanges(ctx, repo, r, w, old, new)
 					if err != nil {
 						return err
 					}
@@ -149,9 +156,11 @@ func Pull(ctx context.Context, repos []types.Repo) error {
 		}
 		fl.Close()
 
-		currentVer, _, _ := strings.Cut(config.Version, "-")
+		if config.Version != "unknown" {
-		if vercmp.Compare(currentVer, repoCfg.Repo.MinVersion) == -1 {
+			currentVer, _, _ := strings.Cut(config.Version, "-")
-			log.Warn("LURE repo's minumum LURE version is greater than the current version. Try updating LURE if something doesn't work.").Str("repo", repo.Name).Send()
+			if vercmp.Compare(currentVer, repoCfg.Repo.MinVersion) == -1 {
+				log.Warn("LURE repo's minumum LURE version is greater than the current version. Try updating LURE if something doesn't work.").Str("repo", repo.Name).Send()
+			}
 		}
 	}
 
@@ -264,7 +273,7 @@ func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository,
 				return err
 			}
 
-			err = db.DeletePkgs("name = ? AND repository = ?", pkg.Name, repo.Name)
+			err = db.DeletePkgs(ctx, "name = ? AND repository = ?", pkg.Name, repo.Name)
 			if err != nil {
 				return err
 			}
@@ -299,7 +308,7 @@ func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository,
 
 			resolveOverrides(runner, &pkg)
 
-			err = db.InsertPackage(pkg)
+			err = db.InsertPackage(ctx, pkg)
 			if err != nil {
 				return err
 			}
@@ -369,7 +378,7 @@ func processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error
 
 		resolveOverrides(runner, &pkg)
 
-		err = db.InsertPackage(pkg)
+		err = db.InsertPackage(ctx, pkg)
 		if err != nil {
 			return err
 		}

pkg/repos/pull_test.go

@@ -26,8 +26,8 @@ import (
 
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/repos"
 )
 
 func setCfgDirs(t *testing.T) {

pkg/search/search.go

@@ -0,0 +1,165 @@
+package search
+
+import (
+	"errors"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"go.elara.ws/lure/internal/config"
+	"go.elara.ws/lure/internal/db"
+)
+
+// Filter represents search filters.
+type Filter int
+
+// Filters
+const (
+	FilterNone Filter = iota
+	FilterInRepo
+	FilterSupportsArch
+)
+
+// SoryBy represents a value that packages can be sorted by.
+type SortBy int
+
+// Sort values
+const (
+	SortByNone = iota
+	SortByName
+	SortByRepo
+	SortByVersion
+)
+
+// Package represents a package from LURE's database
+type Package struct {
+	Name          string
+	Version       string
+	Release       int
+	Epoch         uint
+	Description   map[string]string
+	Homepage      map[string]string
+	Maintainer    map[string]string
+	Architectures []string
+	Licenses      []string
+	Provides      []string
+	Conflicts     []string
+	Replaces      []string
+	Depends       map[string][]string
+	BuildDepends  map[string][]string
+	OptDepends    map[string][]string
+	Repository    string
+}
+
+func convertPkg(p db.Package) Package {
+	return Package{
+		Name:          p.Name,
+		Version:       p.Version,
+		Release:       p.Release,
+		Epoch:         p.Epoch,
+		Description:   p.Description.Val,
+		Homepage:      p.Homepage.Val,
+		Maintainer:    p.Maintainer.Val,
+		Architectures: p.Architectures.Val,
+		Licenses:      p.Licenses.Val,
+		Provides:      p.Provides.Val,
+		Conflicts:     p.Conflicts.Val,
+		Replaces:      p.Replaces.Val,
+		Depends:       p.Depends.Val,
+		OptDepends:    p.OptDepends.Val,
+		Repository:    p.Repository,
+	}
+}
+
+// Options contains the options for a search.
+type Options struct {
+	Filter      Filter
+	FilterValue string
+	SortBy      SortBy
+	Limit       int64
+	Query       string
+}
+
+// Search searches for packages in the database based on the given options.
+func Search(opts Options) ([]Package, error) {
+	query := "(name LIKE ? OR description LIKE ? OR json_array_contains(provides, ?))"
+	args := []any{"%" + opts.Query + "%", "%" + opts.Query + "%", opts.Query}
+
+	if opts.Filter != FilterNone {
+		switch opts.Filter {
+		case FilterInRepo:
+			query += " AND repository = ?"
+		case FilterSupportsArch:
+			query += " AND json_array_contains(architectures, ?)"
+		}
+		args = append(args, opts.FilterValue)
+	}
+
+	if opts.SortBy != SortByNone {
+		switch opts.SortBy {
+		case SortByName:
+			query += " ORDER BY name"
+		case SortByRepo:
+			query += " ORDER BY repository"
+		case SortByVersion:
+			query += " ORDER BY version"
+		}
+	}
+
+	if opts.Limit != 0 {
+		query += " LIMIT " + strconv.FormatInt(opts.Limit, 10)
+	}
+
+	result, err := db.GetPkgs(query, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	var out []Package
+	for result.Next() {
+		pkg := db.Package{}
+		err = result.StructScan(&pkg)
+		if err != nil {
+			return nil, err
+		}
+		out = append(out, convertPkg(pkg))
+	}
+
+	return out, err
+}
+
+// GetPkg gets a single package from the database and returns it.
+func GetPkg(repo, name string) (Package, error) {
+	pkg, err := db.GetPkg("name = ? AND repository = ?", name, repo)
+	return convertPkg(*pkg), err
+}
+
+var (
+	// ErrInvalidArgument is an error returned by GetScript when one of its arguments
+	// contain invalid characters
+	ErrInvalidArgument = errors.New("name and repository must not contain . or /")
+
+	// ErrScriptNotFound is returned by GetScript if it can't find the script requested
+	// by the user.
+	ErrScriptNotFound = errors.New("requested script not found")
+)
+
+// GetScript returns a reader containing the build script for a given package.
+func GetScript(repo, name string) (io.ReadCloser, error) {
+	if strings.Contains(name, "./") || strings.ContainsAny(repo, "./") {
+		return nil, ErrInvalidArgument
+	}
+
+	scriptPath := filepath.Join(config.GetPaths().RepoDir, repo, name, "lure.sh")
+	fl, err := os.Open(scriptPath)
+	if errors.Is(err, fs.ErrNotExist) {
+		return nil, ErrScriptNotFound
+	} else if err != nil {
+		return nil, err
+	}
+
+	return fl, nil
+}

repo.go

@@ -26,9 +26,9 @@ import (
 	"github.com/urfave/cli/v2"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/repos"
 	"golang.org/x/exp/slices"
 )
 
@@ -51,10 +51,13 @@ var addrepoCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		name := c.String("name")
 		repoURL := c.String("url")
 
-		cfg := config.Config()
+		cfg := config.Config(ctx)
 
 		for _, repo := range cfg.Repos {
 			if repo.URL == repoURL {
@@ -67,7 +70,7 @@ var addrepoCmd = &cli.Command{
 			URL:  repoURL,
 		})
 
-		cfgFl, err := os.Create(config.GetPaths().ConfigPath)
+		cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
 		if err != nil {
 			log.Fatal("Error opening config file").Err(err).Send()
 		}
@@ -77,7 +80,7 @@ var addrepoCmd = &cli.Command{
 			log.Fatal("Error encoding config").Err(err).Send()
 		}
 
-		err = repos.Pull(c.Context, cfg.Repos)
+		err = repos.Pull(ctx, cfg.Repos)
 		if err != nil {
 			log.Fatal("Error pulling repos").Err(err).Send()
 		}
@@ -99,8 +102,11 @@ var removerepoCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
 		name := c.String("name")
-		cfg := config.Config()
+		cfg := config.Config(ctx)
 
 		found := false
 		index := 0
@@ -116,7 +122,7 @@ var removerepoCmd = &cli.Command{
 
 		cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
 
-		cfgFl, err := os.Create(config.GetPaths().ConfigPath)
+		cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
 		if err != nil {
 			log.Fatal("Error opening config file").Err(err).Send()
 		}
@@ -126,12 +132,12 @@ var removerepoCmd = &cli.Command{
 			log.Fatal("Error encoding config").Err(err).Send()
 		}
 
-		err = os.RemoveAll(filepath.Join(config.GetPaths().RepoDir, name))
+		err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
 		if err != nil {
 			log.Fatal("Error removing repo directory").Err(err).Send()
 		}
 
-		err = db.DeletePkgs("repository = ?", name)
+		err = db.DeletePkgs(ctx, "repository = ?", name)
 		if err != nil {
 			log.Fatal("Error removing packages from database").Err(err).Send()
 		}
@@ -145,7 +151,9 @@ var refreshCmd = &cli.Command{
 	Usage:   "Pull all repositories that have changed",
 	Aliases: []string{"ref"},
 	Action: func(c *cli.Context) error {
-		err := repos.Pull(c.Context, config.Config().Repos)
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repos").Err(err).Send()
 		}

scripts/gen-version.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-git describe --tags > version.txt

scripts/install.sh

@@ -80,11 +80,11 @@ else
   error "No supported package manager detected!"
 fi
 
-latestVersion=$(curl -sI 'https://gitea.elara.ws/Elara6331/lure/releases/latest' | grep -io 'location: .*' | rev | cut -d '/' -f1 | rev | tr -d '[:space:]')
+latestVersion=$(curl -sI 'https://gitea.elara.ws/lure/lure/releases/latest' | grep -io 'location: .*' | rev | cut -d '/' -f1 | rev | tr -d '[:space:]')
 info "Found latest LURE version:" $latestVersion
 
 fname="$(mktemp -u -p /tmp "lure.XXXXXXXXXX").${pkgFormat}"
-url="https://gitea.elara.ws/Elara6331/lure/releases/download/${latestVersion}/linux-user-repository-${latestVersion#v}-linux-$(uname -m).${pkgFormat}"
+url="https://gitea.elara.ws/lure/lure/releases/download/${latestVersion}/linux-user-repository-${latestVersion#v}-linux-$(uname -m).${pkgFormat}"
 
 info "Downloading LURE package" 
 curl -L $url -o $fname

upgrade.go

@@ -23,14 +23,14 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/distro"
-	"go.elara.ws/lure/internal/build"
 	"go.elara.ws/lure/internal/config"
 	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/log"
-	"go.elara.ws/lure/internal/repos"
 	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/manager"
+	"go.elara.ws/lure/pkg/build"
+	"go.elara.ws/lure/pkg/distro"
+	"go.elara.ws/lure/pkg/loggerctx"
+	"go.elara.ws/lure/pkg/manager"
+	"go.elara.ws/lure/pkg/repos"
 	"go.elara.ws/vercmp"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
@@ -48,7 +48,10 @@ var upgradeCmd = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
-		info, err := distro.ParseOSRelease(c.Context)
+		ctx := c.Context
+		log := loggerctx.From(ctx)
+
+		info, err := distro.ParseOSRelease(ctx)
 		if err != nil {
 			log.Fatal("Error parsing os-release file").Err(err).Send()
 		}
@@ -58,18 +61,18 @@ var upgradeCmd = &cli.Command{
 			log.Fatal("Unable to detect a supported package manager on the system").Send()
 		}
 
-		err = repos.Pull(c.Context, config.Config().Repos)
+		err = repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
 			log.Fatal("Error pulling repos").Err(err).Send()
 		}
 
-		updates, err := checkForUpdates(c.Context, mgr, info)
+		updates, err := checkForUpdates(ctx, mgr, info)
 		if err != nil {
 			log.Fatal("Error checking for updates").Err(err).Send()
 		}
 
 		if len(updates) > 0 {
-			build.InstallPkgs(c.Context, updates, nil, types.BuildOpts{
+			build.InstallPkgs(ctx, updates, nil, types.BuildOpts{
 				Manager:     mgr,
 				Clean:       c.Bool("clean"),
 				Interactive: c.Bool("interactive"),
@@ -89,14 +92,14 @@ func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRe
 	}
 
 	pkgNames := maps.Keys(installed)
-	found, _, err := repos.FindPkgs(pkgNames)
+	found, _, err := repos.FindPkgs(ctx, pkgNames)
 	if err != nil {
 		return nil, err
 	}
 
 	var out []db.Package
 	for pkgName, pkgs := range found {
-		if slices.Contains(config.Config().IgnorePkgUpdates, pkgName) {
+		if slices.Contains(config.Config(ctx).IgnorePkgUpdates, pkgName) {
 			continue
 		}