newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

windows tests: make paths more explicit

This commit is contained in:
Astro 2019-04-11 15:26:44 +02:00 committed by Sébastien Bourdeauducq
parent 4ec5ccb5fd
commit dadb1a0b2e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/windows/default.nix
View File

@ -25,15 +25,15 @@ let
sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$TMPDIR/known_hosts"; sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$TMPDIR/known_hosts";
ssh = cmd: '' ssh = cmd: ''
echo "ssh windows \"${cmd}\"" echo "ssh windows \"${cmd}\""
sshpass -p${sshPassword} -- \ ${sshpass}/bin/sshpass -p${sshPassword} -- \
ssh -np 2022 ${sshOpts} \ ${openssh}/bin/ssh -np 2022 ${sshOpts} \
${sshUser}@localhost \ ${sshUser}@localhost \
"${cmd}" "${cmd}"
''; '';
scp = src: target: '' scp = src: target: ''
echo "Copy ${src} to ${target}" echo "Copy ${src} to ${target}"
sshpass -p${sshPassword} -- \ ${sshpass}/bin/sshpass -p${sshPassword} -- \
scp -P 2022 ${sshOpts} \ ${openssh}/bin/scp -P 2022 ${sshOpts} \
"${src}" "${sshUser}@localhost:${target}" "${src}" "${sshUser}@localhost:${target}"
''; '';
installCondaPkg = pkg: '' installCondaPkg = pkg: ''

8
artiq/windows/install.nix
View File

@ -33,15 +33,15 @@ let
sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\\$TMPDIR/known_hosts"; sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\\$TMPDIR/known_hosts";
ssh = cmd: '' ssh = cmd: ''
echo "ssh windows \"${cmd}\"" echo "ssh windows \"${cmd}\""
sshpass -p${sshPassword} -- \ ${sshpass}/bin/sshpass -p${sshPassword} -- \
ssh -np 2022 ${sshOpts} \ ${openssh}/bin/ssh -np 2022 ${sshOpts} \
${sshUser}@localhost \ ${sshUser}@localhost \
"${cmd}" "${cmd}"
''; '';
scp = src: target: '' scp = src: target: ''
echo "Copy ${src} to ${target}" echo "Copy ${src} to ${target}"
sshpass -p${sshPassword} -- \ ${sshpass}/bin/sshpass -p${sshPassword} -- \
scp -P 2022 ${sshOpts} \ ${openssh}/bin/scp -P 2022 ${sshOpts} \
"${src}" "${sshUser}@localhost:${target}" "${src}" "${sshUser}@localhost:${target}"
''; '';
in in