summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-06-19 19:33:15 +0200
committerJakob Unterwurzacher2016-06-19 19:33:15 +0200
commit1dcafb99ff91e5389263d6c59b7179fd5abef0a5 (patch)
tree735f1c2773314e2629e1e39f40c97a8b7d09ea5d /main.go
parentdba221d408ca0faddb2c597e86a818dcc2daa5e5 (diff)
main: drop "on-disk format" from -version output, add Go version
As v0.4 introduced ext4-style feature flags, the on-disk format version is unlinkely to change. Drop it from the version output to reduce clutter. Use "gocryptfs -version -debug" to see it. Add the Go version string because only Go 1.6 and newer have an optimized AES-GCM implementation. This will help users to understand the performance of their build.
Diffstat (limited to 'main.go')
-rw-r--r--main.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.go b/main.go
index b29b2f6..6467b4b 100644
--- a/main.go
+++ b/main.go
@@ -151,8 +151,8 @@ func changePassword(args *argContainer) {
// printVersion - print a version string like
// "gocryptfs v0.3.1-31-g6736212-dirty; on-disk format 2"
func printVersion() {
- fmt.Printf("%s %s; on-disk format %d; go-fuse %s\n",
- tlog.ProgramName, GitVersion, contentenc.CurrentVersion, GitVersionFuse)
+ fmt.Printf("%s %s; go-fuse %s; %s\n",
+ tlog.ProgramName, GitVersion, GitVersionFuse, runtime.Version())
}
func main() {
@@ -218,6 +218,7 @@ func main() {
// "-v"
if args.version {
tlog.Debug.Printf("openssl=%v\n", args.openssl)
+ tlog.Debug.Printf("on-disk format %d\n", contentenc.CurrentVersion)
printVersion()
os.Exit(0)
}