feat: moves config to $HOME

supabase · Mar 31, 2022 · 6ca3529 · 6ca3529
1 parent 91eead1
commit 6ca3529
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/internal/functions/deploy/deploy.go b/internal/functions/deploy/deploy.go
@@ -59,11 +59,7 @@ func Run(slug string, projectRefArg string) error {
 	var newFunctionBody string
 	{
 		fmt.Println("Bundling " + utils.Bold("supabase/functions/"+slug))
-
-		denoPath, err := xdg.ConfigFile("supabase/deno")
-		if err != nil {
-			return err
-		}
+		denoPath := xdg.Home + "/.supabase/deno"
 
 		cmd := exec.Command(denoPath, "bundle", "--quiet", "supabase/functions/"+slug+"/index.ts")
 		var outBuf, errBuf bytes.Buffer

diff --git a/internal/login/login.go b/internal/login/login.go
@@ -37,10 +37,10 @@ Enter your access token: `)
 
 	// 2. Save access token
 	{
-		accessTokenPath, err := xdg.ConfigFile("supabase/access-token")
-		if err != nil {
+		if err := utils.MkdirIfNotExist(xdg.Home + "/.supabase"); err != nil {
 			return err
 		}
+		accessTokenPath := xdg.Home + "/.supabase/access-token"
 
 		if err := os.WriteFile(accessTokenPath, []byte(accessToken), 0600); err != nil {
 			return err

diff --git a/internal/utils/misc.go b/internal/utils/misc.go
@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/adrg/xdg"
+	"github.com/supabase/cli/internal/utils"
 )
 
 // Update initial schemas in internal/utils/templates/initial_schemas when
@@ -178,10 +179,10 @@ func AssertIsLinked() error {
 }
 
 func InstallOrUpgradeDeno() error {
-	denoPath, err := xdg.ConfigFile("supabase/deno")
-	if err != nil {
+	if err := utils.MkdirIfNotExist(xdg.Home + "/.supabase"); err != nil {
 		return err
 	}
+	denoPath := xdg.Home + "/.supabase/deno"
 
 	if _, err := os.Stat(denoPath); err == nil {
 		// Upgrade Deno.
@@ -269,10 +270,7 @@ func LoadAccessToken() (string, error) {
 		return accessToken, nil
 	}
 
-	accessTokenPath, err := xdg.ConfigFile("supabase/access-token")
-	if err != nil {
-		return "", err
-	}
+	accessTokenPath := xdg.Home + "/.supabase/access-token"
 	accessToken, err := os.ReadFile(accessTokenPath)
 	if errors.Is(err, os.ErrNotExist) || string(accessToken) == "" {
 		return "", errors.New("Access token not provided. Supply an access token by running " + Aqua("supabase login") + " or setting the SUPABASE_ACCESS_TOKEN environment variable.")