From 2322b221df5bdf9a816922567a107ecf699b4739 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 10 May 2020 23:19:33 +0100 Subject: [PATCH] nailing-cargo: Refactor prep for variant .lock etc. Signed-off-by: Ian Jackson --- nailing-cargo | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nailing-cargo b/nailing-cargo index 55b9f99..fa16da5 100755 --- a/nailing-cargo +++ b/nailing-cargo @@ -363,14 +363,24 @@ sub oot_massage_cmdline () { ($pre, $post) = ('cd "$1"; shift;', ''); } else { push @xargs, $oot_absdir, $subdir, $src_absdir; - ($pre, $post) = (<<'END', <<'END'); + $pre = <<'END'; cd "$1"; shift; mkdir -p -- "$1"; cd "$1"; shift; - cp -- "$1"/Cargo.toml "$1"/Cargo.lock .; shift; - mkdir -p src; >src/lib.rs; + cp -- "$1"/Cargo.toml .; END - rm -r src Cargo.toml; + $pre .= <<'END'; + cp -- "$1"/Cargo.lock .; END + $pre .= <<'ENDLK'; + cp -- "$1"/Cargo.lock .; +ENDLK + $pre .= <<'ENDPRE'; + shift + mkdir -p src; >src/lib.rs; +ENDPRE + $post = <<'ENDPOST'; + rm -r src Cargo.toml; +ENDPOST $pre =~ s/^\s+//mg; $pre =~ s/^\s+\n/ /g; $post =~ s/^\s+//mg; $post =~ s/^\s+\n/ /g; } -- 2.30.2