Undo that, have env be read from actual env

This commit is contained in:
2025-09-25 15:37:33 +02:00
parent 8f39e19295
commit 0adbca216c
3 changed files with 5 additions and 29 deletions

1
go.mod
View File

@@ -5,7 +5,6 @@ go 1.22.4
require ( require (
code.gitea.io/sdk/gitea v0.18.0 code.gitea.io/sdk/gitea v0.18.0
github.com/go-git/go-git/v5 v5.12.0 github.com/go-git/go-git/v5 v5.12.0
github.com/joho/godotenv v1.5.1
golang.design/x/clipboard v0.7.0 golang.design/x/clipboard v0.7.0
) )

2
go.sum
View File

@@ -47,8 +47,6 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

31
main.go
View File

@@ -1,7 +1,6 @@
package main package main
import ( import (
"bytes"
_ "embed" _ "embed"
"flag" "flag"
"fmt" "fmt"
@@ -13,7 +12,6 @@ import (
"code.gitea.io/sdk/gitea" "code.gitea.io/sdk/gitea"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config" "github.com/go-git/go-git/v5/config"
"github.com/joho/godotenv"
"golang.design/x/clipboard" "golang.design/x/clipboard"
) )
@@ -39,42 +37,23 @@ func init() {
} }
func main() { func main() {
envFilePath := flag.String("env", ".env", "Path to the .env file")
flag.Parse()
// if *envFilePath == "" {
// Error.Fatalf("Environment file path is required")
// return
// }
err := clipboard.Init() err := clipboard.Init()
if err != nil { if err != nil {
Error.Fatalf("Error initializing clipboard: %v", err) Error.Fatalf("Error initializing clipboard: %v", err)
return return
} }
env, err := os.ReadFile(*envFilePath) username, ok := os.LookupEnv("GITEA_USER")
if err != nil {
Warning.Fatalf("Error reading .env file: %v", err)
// return
}
envvar, err := godotenv.Parse(bytes.NewReader(env))
if err != nil {
Error.Fatalf("Error parsing .env file: %v", err)
return
}
username, ok := envvar["GITEA_USER"]
if !ok { if !ok {
Error.Fatalf("GITEA_USER environment variable is required") Error.Fatalf("GITEA_USER environment variable is required")
return return
} }
password, ok := envvar["GITEA_PASSWORD"] password, ok := os.LookupEnv("GITEA_PASSWORD")
if !ok { if !ok {
Error.Fatalf("GITEA_PASSWORD environment variable is required") Error.Fatalf("GITEA_PASSWORD environment variable is required")
return return
} }
url, ok := envvar["GITEA_URL"] url, ok := os.LookupEnv("GITEA_URL")
if !ok { if !ok {
Error.Fatalf("GITEA_URL environment variable is required") Error.Fatalf("GITEA_URL environment variable is required")
return return
@@ -112,9 +91,9 @@ func main() {
Error.Fatalf("Error creating client: %v", err) Error.Fatalf("Error creating client: %v", err)
return return
} }
client.SetBasicAuth("dave", "D7u@NHh^9d33ue!xVAEu") client.SetBasicAuth(username, password)
repo, _, err := client.GetRepo("dave", name) repo, _, err := client.GetRepo(username, name)
if err == nil { if err == nil {
log.Printf("Repository already exists at:\n%s", repo.CloneURL) log.Printf("Repository already exists at:\n%s", repo.CloneURL)
clipboard.Write(clipboard.FmtText, []byte(repo.CloneURL)) clipboard.Write(clipboard.FmtText, []byte(repo.CloneURL))