daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 14:20:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

cli: generalize to remote flake

Browse source
This commit is contained in:
Daylin Morgan 2024-06-27 11:10:49 -05:00
parent c3af54a9f6
commit 517958b8b3
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/oizys/cmd/output.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"oizys/internal/oizys" "oizys/internal/oizys"
) )

3
pkgs/oizys/cmd/root.go
View file

@ -48,11 +48,8 @@ var rootCmd = &cobra.Command{
} }
oizys.SetFlake(flake) oizys.SetFlake(flake)
oizys.SetHost(host) oizys.SetHost(host)
oizys.SetCache(cacheName) // TODO: move
oizys.SetVerbose(verbose) oizys.SetVerbose(verbose)
oizys.SetResetCache(resetCache) oizys.SetResetCache(resetCache)
oizys.CheckFlake()
}, },
} }

48
pkgs/oizys/internal/oizys/main.go
View file

@ -11,7 +11,6 @@ import (
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/briandowns/spinner"
"github.com/charmbracelet/log" "github.com/charmbracelet/log"
) )
@ -55,9 +54,19 @@ func New() *Oizys {
} }
func SetFlake(path string) { func SetFlake(path string) {
// Check path exists
if path != "" { if path != "" {
o.flake = path o.flake = path
} }
// check local path exists
if !strings.HasPrefix(o.flake, "github") && !strings.HasPrefix(o.flake, "git+") {
if _, ok := os.LookupEnv("OIZYS_SKIP_CHECK"); !ok {
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
log.Warnf("path to flake %s does not exist, using remote as fallback", o.flake)
o.flake = "github:daylinmorgan/oizys"
}
}
}
} }
func SetCache(name string) { func SetCache(name string) {
@ -131,24 +140,6 @@ func Output() string {
} }
} }
// func (o *Oizys) Set(
// flake, host, cache string,
// verbose, systemPath, resetCache bool,
// ) {
// if host != "" {
// o.host = host
// }
// if flake != "" {
// o.flake = flake
// }
// if cache != "" {
// o.cache = cache
// }
// o.verbose = verbose
// o.systemPath = systemPath
// o.resetCache = resetCache
// }
func git(rest ...string) *exec.Cmd { func git(rest ...string) *exec.Cmd {
args := []string{"-C", o.flake} args := []string{"-C", o.flake}
args = append(args, rest...) args = append(args, rest...)
@ -497,11 +488,6 @@ func CacheBuild(rest ...string) {
} }
func CheckFlake() { func CheckFlake() {
if _, ok := os.LookupEnv("OIZYS_SKIP_CHECK"); !ok {
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
log.Fatalf("path to flake: %s does not exist", o.flake)
}
}
} }
func CI(rest ...string) { func CI(rest ...string) {
@ -511,10 +497,10 @@ func CI(rest ...string) {
exitWithCommand(cmd) exitWithCommand(cmd)
} }
// TODO: deprecate // // TODO: deprecate
func nixSpinner(host string) *spinner.Spinner { // func nixSpinner(host string) *spinner.Spinner {
msg := fmt.Sprintf("%s %s", " evaluating derivation for:", // msg := fmt.Sprintf("%s %s", " evaluating derivation for:",
lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("6")).Render(host), // lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("6")).Render(host),
) // )
return startSpinner(msg) // return startSpinner(msg)
} // }