Merge branch 'master' into kd-live

replacer/main.go

@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"path"
 	"strconv"
+	"time"
 )
 
 func copy(src, dst string) error {
@@ -63,11 +64,20 @@ func main() {
 	if err != nil {
 		stdlog.Fatal(err)
 	}
-	proc, err := os.FindProcess(pid)
+
-	if err != nil {
+	for {
-		stdlog.Fatal(err)
+		stdlog.Println("wait for terminating of", args[3])
+		proc, err := os.FindProcess(pid)
+		if err != nil {
+			stdlog.Fatal(err)
+		}
+		state, _ := proc.Wait()
+		if state == nil {
+			break
+		}
+
+		time.Sleep(time.Second)
 	}
-	proc.Wait()
 
 	selfext, _ := os.Executable()
 	selfext = path.Base(selfext)