Compare commits

..

2 Commits

Author SHA1 Message Date
Jim McDonald
85c7c7fc55 Bump version 2020-08-02 21:54:43 +01:00
Jim McDonald
05406e8d81 Allow fetching wallet from account variable as well as wallet 2020-08-02 17:02:45 +01:00
2 changed files with 6 additions and 2 deletions

View File

@@ -233,8 +233,12 @@ func outputIf(condition bool, msg string) {
}
}
// walletFromInput obtains a wallet given the information in the viper variable "wallet".
// walletFromInput obtains a wallet given the information in the viper variable
// "account", or if not present the viper variable "wallet".
func walletFromInput(ctx context.Context) (e2wtypes.Wallet, error) {
if viper.GetString("account") != "" {
return walletFromPath(ctx, viper.GetString("account"))
}
return walletFromPath(ctx, viper.GetString("wallet"))
}

View File

@@ -22,7 +22,7 @@ import (
"github.com/spf13/viper"
)
var ReleaseVersion = "local build from v1.5.5"
var ReleaseVersion = "local build from v1.5.6"
// versionCmd represents the version command
var versionCmd = &cobra.Command{