Merge pull request #1 from jamf/master

merge upstream
BrandonRoehl · Jan 21, 2020 · 020d6e4 · 020d6e4
2 parents c41f2ea + 38ef509
commit 020d6e4
Show file tree

Hide file tree

Showing 10 changed files with 561 additions and 388 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.11.x
+  - 1.13.x
   - master
 
 script:

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ func main() {
   config.Addr = "your-hostname:your-port"
 
   dumpDir := "dumps"  // you should create this directory
-  dumpFilenameFormat := fmt.Sprintf("%s-20060102T150405", dbname)   // accepts time layout string and add .sql at the end of file
+  dumpFilenameFormat := fmt.Sprintf("%s-20060102T150405", config.DBName)   // accepts time layout string and add .sql at the end of file
 
-  db, err := sql.Open("mysql", config.FormatDNS())
+  db, err := sql.Open("mysql", config.FormatDSN())
   if err != nil {
     fmt.Println("Error opening database: ", err)
     return
@@ -39,12 +39,12 @@ func main() {
   }
 
   // Dump database to file
-  resultFilename, err := dumper.Dump()
+  err := dumper.Dump()
   if err != nil {
     fmt.Println("Error dumping:", err)
     return
   }
-  fmt.Printf("File is saved to %s", resultFilename)
+  fmt.Printf("File is saved to %s", dumpFilenameFormat)
 
   // Close dumper, connected database and file stream.
   dumper.Close()
-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     language: go
     go:
-      - 1.11.x
+      - 1.13.x
       - master
     script:
@@ Expand Down @@