all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 2/7] tui: install progress: split out low-level installer spawing into own function
Date: Wed, 26 Jul 2023 16:03:56 +0200	[thread overview]
Message-ID: <20230726140406.1048552-3-c.heiss@proxmox.com> (raw)
In-Reply-To: <20230726140406.1048552-1-c.heiss@proxmox.com>

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 .../src/views/install_progress.rs             | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/proxmox-tui-installer/src/views/install_progress.rs b/proxmox-tui-installer/src/views/install_progress.rs
index e9d764a..870c6a3 100644
--- a/proxmox-tui-installer/src/views/install_progress.rs
+++ b/proxmox-tui-installer/src/views/install_progress.rs
@@ -58,35 +58,35 @@ impl InstallProgressView {
     }
 }
 
+fn spawn_low_level_installer() -> io::Result<process::Child> {
+    use std::process::{Command, Stdio};
+
+    #[cfg(not(debug_assertions))]
+    let (path, args, envs): (&str, [&str; 1], [(&str, &str); 0]) =
+        ("proxmox-low-level-installer", ["start-session"], []);
+
+    #[cfg(debug_assertions)]
+    let (path, args, envs) = (
+        std::path::PathBuf::from("./proxmox-low-level-installer"),
+        ["-t", "start-session-test"],
+        [("PERL5LIB", ".")],
+    );
+
+    Command::new(path)
+        .args(args)
+        .envs(envs)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()
+}
+
 fn progress_task(
     counter: Counter,
     cb_sink: CbSink,
     options: InstallerOptions,
     progress_text: TextContent,
 ) {
-    let child = {
-        use std::process::{Command, Stdio};
-
-        #[cfg(not(debug_assertions))]
-        let (path, args, envs): (&str, [&str; 1], [(&str, &str); 0]) =
-            ("proxmox-low-level-installer", ["start-session"], []);
-
-        #[cfg(debug_assertions)]
-        let (path, args, envs) = (
-            std::path::PathBuf::from("./proxmox-low-level-installer"),
-            ["-t", "start-session-test"],
-            [("PERL5LIB", ".")],
-        );
-
-        Command::new(path)
-            .args(args)
-            .envs(envs)
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .spawn()
-    };
-
-    let mut child = match child {
+    let mut child = match spawn_low_level_installer() {
         Ok(child) => child,
         Err(err) => {
             let _ = cb_sink.send(Box::new(move |siv| {
-- 
2.41.0





  parent reply	other threads:[~2023-07-26 14:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-26 14:03 [pve-devel] [PATCH installer 0/7] refactor; improve installation progress Christoph Heiss
2023-07-26 14:03 ` [pve-devel] [PATCH installer 1/7] tui: move install progress dialog into own view module Christoph Heiss
2023-07-26 14:03 ` Christoph Heiss [this message]
2023-07-26 14:03 ` [pve-devel] [PATCH installer 3/7] tui: install progress: split out reboot handling into own function Christoph Heiss
2023-07-26 14:03 ` [pve-devel] [PATCH installer 4/7] tui: install progress: split out prompt logic " Christoph Heiss
2023-07-26 14:03 ` [pve-devel] [PATCH installer 5/7] tui: install progress: handle errors in ui message loop more gracefully Christoph Heiss
2023-07-26 14:04 ` [pve-devel] [PATCH installer 6/7] low-level: avoid open-coding config reading, parsing and merging Christoph Heiss
2023-07-26 14:04 ` [pve-devel] [PATCH installer 7/7] low-level, tui: count down auto-reboot timeout Christoph Heiss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230726140406.1048552-3-c.heiss@proxmox.com \
    --to=c.heiss@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal