Skip to content

Commit efc886f

Browse files
committed
Move go install copy into text package
1 parent 59bed46 commit efc886f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func main() {
5656
if text.CommandVersion == "0.0.0-dev" || strings.Contains(text.CommandVersion, "-") {
5757
rev = "master"
5858
}
59-
fmt.Fprintf(os.Stderr, "\ntry:\n\n go install -tags 'most %s' github.com/xo/usql@%s\n\n", tag, rev)
59+
fmt.Fprintf(os.Stderr, text.GoInstallHint, tag, rev)
6060
}
6161
switch estr := err.Error(); {
6262
case err == text.ErrWrongNumberOfArguments,

run.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func New(cliargs []string) ContextExecutor {
9797
powershellCompletion,
9898
cmd.Name() == "__complete":
9999
flags := cmd.Root().Flags()
100-
for _, name := range []string{"no-psqlrc", "no-usqlrc", "var", "variable"} {
100+
for _, name := range []string{"no-psqlrc", "no-" + text.CommandName + "rc", "var", "variable"} {
101101
flags.Lookup(name).Hidden = false
102102
}
103103
}
@@ -160,10 +160,10 @@ func New(cliargs []string) ContextExecutor {
160160

161161
// general flags
162162
flags.BoolVarP(&args.NoPassword, "no-password", "w", false, "never prompt for password")
163-
flags.BoolVarP(&args.NoInit, "no-init", "X", false, "do not execute initialization scripts (aliases: --no-rc --no-psqlrc --no-usqlrc)")
163+
flags.BoolVarP(&args.NoInit, "no-init", "X", false, "do not execute initialization scripts (aliases: --no-rc --no-psqlrc --no-"+text.CommandName+"rc)")
164164
flags.BoolVar(&args.NoInit, "no-rc", false, "do not read startup file")
165165
flags.BoolVar(&args.NoInit, "no-psqlrc", false, "do not read startup file")
166-
flags.BoolVar(&args.NoInit, "no-usqlrc", false, "do not read startup file")
166+
flags.BoolVar(&args.NoInit, "no-"+text.CommandName+"rc", false, "do not read startup file")
167167
flags.VarP(filevar{&args.Out}, "out", "o", "output file")
168168
flags.BoolVarP(&args.ForcePassword, "password", "W", false, "force password prompt (should happen automatically)")
169169
flags.BoolVarP(&args.SingleTransaction, "single-transaction", "1", false, "execute as a single transaction (if non-interactive)")
@@ -212,7 +212,7 @@ func New(cliargs []string) ContextExecutor {
212212

213213
// mark hidden
214214
for _, name := range []string{
215-
"no-rc", "no-psqlrc", "no-usqlrc", "var", "variable",
215+
"no-rc", "no-psqlrc", "no-" + text.CommandName + "rc", "var", "variable",
216216
"completion-script-bash", "completion-script-zsh", "completion-script-fish",
217217
"completion-script-powershell", "no-descriptions",
218218
"bad-help",

text/text.go

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var (
1919
ConfigName = "config"
2020
Banner = `the universal command-line interface for SQL databases`
2121
CommandHelpHint = `hint: try "` + CommandName + ` --help" for more information.`
22+
GoInstallHint = "\ntry:\n\n go install -tags 'most %s' github.com/xo/usql@%s\n\n"
2223
NotConnected = `(not connected)`
2324
HelpPrefix = `help`
2425
QuitPrefix = `quit`

0 commit comments

Comments
 (0)