nailing-cargo: Refactor prep for variant .lock etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/nailing-cargo b/nailing-cargo
index 55b9f99e4e7965d1d2b631923b2adb287d86dbfc..fa16da5da1811a3a1f86455fc899b2537e1a2208 100755 (executable)
--- 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;
   }