52ed3570c4
This change updates our urfave/cli dependency to the v2 branch of the library. There are some Go API changes in cli v2: - Flag values can now be accessed using the methods ctx.Bool, ctx.Int, ctx.String, ... regardless of whether the flag is 'local' or 'global'. - v2 has built-in support for flag categories. Our home-grown category system is removed and the categories of flags are assigned as part of the flag definition. For users, there is only one observable difference with cli v2: flags must now strictly appear before regular arguments. For example, the following command is now invalid: geth account import mykey.json --password file.txt Instead, the command must be invoked as follows: geth account import --password file.txt mykey.json
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
// Copyright 2017 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/ethereum/go-ethereum/cmd/utils"
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
// getPassphrase obtains a passphrase given by the user. It first checks the
|
|
// --passfile command line flag and ultimately prompts the user for a
|
|
// passphrase.
|
|
func getPassphrase(ctx *cli.Context, confirmation bool) string {
|
|
// Look for the --passwordfile flag.
|
|
passphraseFile := ctx.String(passphraseFlag.Name)
|
|
if passphraseFile != "" {
|
|
content, err := os.ReadFile(passphraseFile)
|
|
if err != nil {
|
|
utils.Fatalf("Failed to read password file '%s': %v",
|
|
passphraseFile, err)
|
|
}
|
|
return strings.TrimRight(string(content), "\r\n")
|
|
}
|
|
|
|
// Otherwise prompt the user for the passphrase.
|
|
return utils.GetPassPhrase("", confirmation)
|
|
}
|
|
|
|
// mustPrintJSON prints the JSON encoding of the given object and
|
|
// exits the program with an error message when the marshaling fails.
|
|
func mustPrintJSON(jsonObject interface{}) {
|
|
str, err := json.MarshalIndent(jsonObject, "", " ")
|
|
if err != nil {
|
|
utils.Fatalf("Failed to marshal JSON object: %v", err)
|
|
}
|
|
fmt.Println(string(str))
|
|
}
|