From 525b91cb214d7265241f1e67cbae25e3a56041d4 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 10 Nov 2019 19:33:16 +0800 Subject: [PATCH] windows: work around $i not working in $ssh --- artiq-fast/windows/run-test.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix index bdbfb1c..9cc2d4d 100644 --- a/artiq-fast/windows/run-test.nix +++ b/artiq-fast/windows/run-test.nix @@ -53,11 +53,14 @@ stdenv.mkDerivation { echo "Wait for Windows to boot" sleep 10 ${ssh "ver"} - i=0 - for pkg in ${sipycoPkg}/noarch/sipyco*.tar.bz2 ${artiqPkg}/noarch/artiq*.tar.bz2 ; do - ${scp "\\$pkg" "to_install\\$i.tar.bz2"} - ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install to_install\\$i.tar.bz2"} - ((i=i+1)) + # FIXME: clean up this hack with the for loops + for pkg in ${sipycoPkg}/noarch/sipyco*.tar.bz2 ; do + ${scp "\\$pkg" "sipyco.tar.bz2"} + ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install sipyco.tar.bz2"} + done + for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do + ${scp "\\$pkg" "artiq.tar.bz2"} + ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"} done # Schedule a timed shutdown against hanging test runs