From 4ec5ccb5fd264ca9a4e1748fa25bbd7ad009b61b Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Tue, 9 Apr 2019 21:34:10 +0200
Subject: [PATCH] windows tests: fix escaping, tmpdir in install

---
 artiq/windows/install.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix
index dcc98b2..5904272 100644
--- a/artiq/windows/install.nix
+++ b/artiq/windows/install.nix
@@ -30,7 +30,7 @@ let
 
   sshUser = "user";
   sshPassword = "user";
-  sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$TMPDIR/known_hosts";
+  sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\\$TMPDIR/known_hosts";
   ssh = cmd: ''
     echo "ssh windows \"${cmd}\""
     sshpass -p${sshPassword} -- \
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     #!/usr/bin/env bash
     set -e -m
 
-    TMPDIR=$(mktemp)
+    TMPDIR=\$(mktemp -d)
 
     if [ ! -f c.img ] ; then 
       ${qemu}/bin/qemu-img create -f qcow2 c.img ${diskImageSize}
@@ -106,7 +106,7 @@ stdenv.mkDerivation {
     echo "Waiting for qemu exit"
     wait
 
-    rm -rf $TMPDIR
+    rm -rf \$TMPDIR
     EOF
     chmod a+x $out/bin/networked-installer.sh
   '';