aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/fscrypt/fscrypt.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/fscrypt/fscrypt.go b/cmd/fscrypt/fscrypt.go
index e260f7f..069cc96 100644
--- a/cmd/fscrypt/fscrypt.go
+++ b/cmd/fscrypt/fscrypt.go
@@ -31,6 +31,8 @@ import (
"os"
"github.com/urfave/cli"
+
+ "github.com/google/fscrypt/actions"
)
// Current version of the program (set by Makefile)
@@ -41,6 +43,10 @@ func main() {
cli.CommandHelpTemplate = commandHelpTemplate
cli.SubcommandHelpTemplate = subcommandHelpTemplate
+ if conffile := os.Getenv("FSCRYPT_CONF"); conffile != "" {
+ actions.ConfigFileLocation = conffile
+ }
+
// Create our command line application
app := cli.NewApp()
app.Usage = shortUsage