provisioner/shell: Properly handle closed channels in select

provisioner/shell/provisioner.go

@@ -64,25 +64,38 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) {
 	stderr := cmd.StderrChan()
 	stdout := cmd.StdoutChan()
 
+OutputLoop:
 	for {
 		select {
-		case output := <-stderr:
+		case output, ok := <-stderr:
+			if !ok {
+				stderr = nil
+			} else {
 				ui.Say(output)
-		case output := <-stdout:
+			}
+		case output, ok := <-stdout:
+			if !ok {
+				stdout = nil
+			} else {
 				ui.Say(output)
+			}
 		case exitStatus := <-exit:
 			log.Printf("shell provisioner exited with status %d", exitStatus)
-			break
+			break OutputLoop
 		}
 	}
 
 	// Make sure we finish off stdout/stderr because we may have gotten
 	// a message from the exit channel first.
+	if stdout != nil {
 		for output := range stdout {
 			ui.Say(output)
 		}
+	}
 
+	if stderr != nil {
 		for output := range stderr {
 			ui.Say(output)
 		}
 	}
+}