Merge pull request #42 from ipfs/feat/3-to-4

Feat/3 to 4

Author: whyrusleeping

Makefile

@@ -1,4 +1,3 @@
-
-
 install:
 	go install
+	@echo "fs-repo-migrations now installed, type 'fs-repo-migrations' to run"

README.md

@@ -40,7 +40,8 @@ ipfs repo version | go-ipfs versions
 ----------------- | ----------------
                 1 |    0.0.0 - 0.2.3
                 2 |   0.3.0 - 0.3.11
-                3 |  0.4.0 - current
+                3 |  0.4.0 - 0.4.2
+                4 |  0.4.3 - current
 
 ### How to Run Migrations
 

go-migrate/cli.go

@@ -17,7 +17,7 @@ func (f *Flags) Setup() {
 	flag.BoolVar(&f.Force, "f", false, "whether to force a migration (ignores warnings)")
 	flag.BoolVar(&f.Revert, "revert", false, "whether to apply the migration backwards")
 	flag.BoolVar(&f.Verbose, "verbose", false, "enable verbose logging")
-	flag.StringVar(&f.Path, "path", "", "file path to migrate for fs based migrations")
+	flag.StringVar(&f.Path, "path", "", "file path to migrate for fs based migrations (required)")
 }
 
 func (f *Flags) Parse() {

ipfs-3-to-4/migration/migration.go

@@ -327,7 +327,16 @@ func revertIpnsEntries(ds dstore.Datastore, oldk dstore.Key, data []byte, mkkey
 
 func transferBlocks(flatfsdir string) error {
 	var keys []string
+	dots := 0
 	filepath.Walk(flatfsdir, func(p string, i os.FileInfo, err error) error {
+		if dots%200 == 0 {
+			fmt.Printf("\r                         \renumerating keys")
+		}
+		if dots%40 == 39 {
+			fmt.Printf(".")
+		}
+		dots++
+
 		if i.IsDir() {
 			return nil
 		}

run.md

@@ -27,14 +27,7 @@ cp -r ~/.ipfs ~/.ipfs.bak
 ## Step 1. Downloading the Migration
 
 - If you have Go installed: `go get -u github.com/ipfs/fs-repo-migrations`
-- Otherwise, download a prebuilt binary:
-  - [Mac OSX](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_darwin-amd64.zip)
-  - [Linux 32bit](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_linux-386.zip)
-  - [Linux 64bit](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_linux-amd64.zip)
-  - [Linux ARM](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_linux-arm.zip)
-  - [Windows 32bit](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_windows-386.zip)
-  - [Windows 64bit](https://gobuilder.me/get/github.com/ipfs/fs-repo-migrations/fs-repo-migrations_master_windows-amd64.zip)
-  - [See more available builds](https://gobuilder.me/github.com/ipfs/fs-repo-migrations)
+- Otherwise, download a prebuilt binary from [the distributions page](https://dist.ipfs.io/#fs-repo-migrations)
 
 ## Step 2. Run the Migration