Skip to content

Commit d753cc5

Browse files
authored
Improve ddev import-db and ddev import-files queries for path to artifacts (ddev#4656) [skip ci]
1 parent edbd571 commit d753cc5

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

cmd/ddev/cmd/import-files.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func promptForFileSource(val *string) {
8686
// An empty string isn't acceptable here, keep
8787
// prompting until something is entered
8888
for {
89-
fmt.Print("Pull path: ")
89+
fmt.Print("Path to file(s): ")
9090
*val = util.GetInput("")
9191
if len(*val) > 0 {
9292
break

pkg/ddevapp/ddevapp.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@ import (
44
"bytes"
55
"embed"
66
"fmt"
7-
"github.com/drud/ddev/pkg/globalconfig"
8-
"github.com/drud/ddev/pkg/nodeps"
9-
"github.com/drud/ddev/pkg/versionconstants"
10-
"github.com/mattn/go-isatty"
11-
"github.com/otiai10/copy"
12-
"golang.org/x/term"
13-
"gopkg.in/yaml.v3"
147
"os"
8+
"path"
159
"path/filepath"
1610
"runtime"
1711
"strconv"
1812
"strings"
19-
20-
"path"
2113
"time"
2214

2315
"github.com/drud/ddev/pkg/appimport"
2416
"github.com/drud/ddev/pkg/archive"
2517
"github.com/drud/ddev/pkg/dockerutil"
2618
"github.com/drud/ddev/pkg/exec"
2719
"github.com/drud/ddev/pkg/fileutil"
20+
"github.com/drud/ddev/pkg/globalconfig"
21+
"github.com/drud/ddev/pkg/nodeps"
2822
"github.com/drud/ddev/pkg/output"
2923
"github.com/drud/ddev/pkg/util"
24+
"github.com/drud/ddev/pkg/versionconstants"
3025
docker "github.com/fsouza/go-dockerclient"
26+
"github.com/mattn/go-isatty"
27+
"github.com/otiai10/copy"
28+
"golang.org/x/term"
29+
"gopkg.in/yaml.v3"
3130
)
3231

3332
// SiteRunning defines the string used to denote running sites.
@@ -485,7 +484,7 @@ func (app *DdevApp) ImportDB(imPath string, extPath string, progress bool, noDro
485484
extPathPrompt = true
486485
}
487486
output.UserOut.Println("Provide the path to the database you want to import.")
488-
fmt.Print("Pull path: ")
487+
fmt.Print("Path to file: ")
489488

490489
imPath = util.GetInput("")
491490
}

0 commit comments

Comments
 (0)