modified: cmd/immortal/main.go

	modified:   fork.go

cmd/immortal/main.go

@@ -125,13 +125,16 @@ func main() {
 		}
 	}
 
-	if pid, err = D.Fork(); err != nil {
-		log.Printf("Error while forking: %s", err)
-		os.Exit(1)
-	} else {
-		if pid > 0 {
-			fmt.Printf("%c  %d\n", ir.Logo(), pid)
-			os.Exit(0)
+	// fork
+	if os.Getppid() > 1 {
+		if pid, err = D.Fork(); err != nil {
+			log.Printf("Error while forking: %s", err)
+			os.Exit(1)
+		} else {
+			if pid > 0 {
+				fmt.Printf("%c  %d\n", ir.Logo(), pid)
+				os.Exit(0)
+			}
 		}
 	}
 

fork.go

@@ -7,22 +7,19 @@ import (
 )
 
 func (self *Daemon) Fork() (int, error) {
-	if os.Getppid() > 1 {
-		args := os.Args[1:]
-		cmd := exec.Command(os.Args[0], args...)
-		cmd.Env = append(cmd.Env, os.Environ()...)
-		cmd.Stdin = nil
-		cmd.Stdout = nil
-		cmd.Stderr = nil
-		cmd.ExtraFiles = nil
-		cmd.SysProcAttr = &syscall.SysProcAttr{
-			Setpgid: true,
-			Pgid:    0,
-		}
-		if err := cmd.Start(); err != nil {
-			return 0, err
-		}
-		return cmd.Process.Pid, nil
+	args := os.Args[1:]
+	cmd := exec.Command(os.Args[0], args...)
+	cmd.Env = append(cmd.Env, os.Environ()...)
+	cmd.Stdin = nil
+	cmd.Stdout = nil
+	cmd.Stderr = nil
+	cmd.ExtraFiles = nil
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setpgid: true,
+		Pgid:    0,
 	}
-	return 0, nil
+	if err := cmd.Start(); err != nil {
+		return 0, err
+	}
+	return cmd.Process.Pid, nil
 }