From 3b8c85a70a3923c2d73bb7a18757b3a480f6526a Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Sat, 13 Apr 2019 23:32:09 +0200 Subject: [PATCH] windows tests: move install.txt into separate file --- artiq/windows/install.nix | 18 +++++------------- artiq/windows/install.txt | 13 +++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 artiq/windows/install.txt diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix index f885bef..f2352ca 100644 --- a/artiq/windows/install.nix +++ b/artiq/windows/install.nix @@ -49,6 +49,10 @@ let builtins.concatStringsSep " " (map (s: "\"${s}\"") (import ../conda-artiq-deps.nix)); + + instructions = + builtins.toFile "install.txt" + (builtins.readFile ./install.txt); in stdenv.mkDerivation { name = "windows-installer"; @@ -83,19 +87,7 @@ stdenv.mkDerivation { "-drive" "file=c.img,index=0,media=disk" ]} & fi - echo "Add user account with expected password [user/user]." - echo "Enable the OpenSSH server:" - echo "- \"Add or remove programs\"" - echo "- \"Manage optional features\"" - echo "- \"Add a feature\"" - echo "- \"OpenSSH Server\"" - echo "- \"Install\"" - echo "- Open \"Services\"" - echo "- Double-click the \"OpenSSH SSH Server\" service" - echo "- Set \"Startup type\" to \"Automatic\"" - echo "- \"Start\"" - echo "- \"Ok\"" - echo "Then press ENTER here to proceed with automatic installation" + cat ${instructions} read ${ssh "ver"} diff --git a/artiq/windows/install.txt b/artiq/windows/install.txt new file mode 100644 index 0000000..a2576c1 --- /dev/null +++ b/artiq/windows/install.txt @@ -0,0 +1,13 @@ +Add user account with expected password [user/user]. +Enable the OpenSSH server: +- "Add or remove programs" +- "Manage optional features" +- "Add a feature" +- "OpenSSH Server" +- "Install" +- Open "Services" +- Double-click the "OpenSSH SSH Server" service +- Set "Startup type" to "Automatic" +- "Start" +- "Ok" +Then press ENTER here to proceed with automatic installation