From 453384107e41991a5417c7c3ed78da6cb1c4a805 Mon Sep 17 00:00:00 2001 From: Petter Rasmussen Date: Sun, 21 Feb 2016 11:59:12 +0100 Subject: Support getting config dir from environment variable i.e. GDRIVE_CONFIG_DIR="/home/user/.gdrive" --- handlers_drive.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'handlers_drive.go') diff --git a/handlers_drive.go b/handlers_drive.go index 3ca2c6a..957161f 100644 --- a/handlers_drive.go +++ b/handlers_drive.go @@ -323,11 +323,19 @@ func getOauthClient(args cli.Arguments) (*http.Client, error) { return auth.NewAccessTokenClient(ClientId, ClientSecret, args.String("accessToken")), nil } - configDir := args.String("configDir") + configDir := getConfigDir(args) tokenPath := ConfigFilePath(configDir, TokenFilename) return auth.NewFileSourceClient(ClientId, ClientSecret, tokenPath, authCodePrompt) } +func getConfigDir(args cli.Arguments) string { + // Use dir from environment var if present + if os.Getenv("GDRIVE_CONFIG_DIR") != "" { + return os.Getenv("GDRIVE_CONFIG_DIR") + } + return args.String("configDir") +} + func newDrive(args cli.Arguments) *drive.Drive { oauth, err := getOauthClient(args) if err != nil { -- cgit v1.2.3