From 3b105a75b5c797d3b094f9f098b2f6d3d446a2e2 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Mon, 30 Oct 2023 11:26:00 +0000 Subject: [PATCH] Use 'spoiler' rather than 'solution' for the platform-specific upload instructions --- episodes/05-writing-scripts.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/episodes/05-writing-scripts.md b/episodes/05-writing-scripts.md index eaa9defe..dd82b666 100644 --- a/episodes/05-writing-scripts.md +++ b/episodes/05-writing-scripts.md @@ -330,9 +330,12 @@ using a transfer program, it needs to be installed on your local machine, not yo ## Transferring Data Between your Local Machine and the Cloud -::::::::::::::: solution +If you are using Linux, Mac OS, or Windows with Git Bash on your local machine, you can use +`scp` to upload data to your virtual machine. -### Uploading Data to your Virtual Machine with scp on Linux, Mac OS and Windows with Git Bash +::::::::::::::: spoiler + +### SCP `scp` stands for 'secure copy protocol', and is a widely used UNIX tool for moving files between computers. The simplest way to use `scp` is to run it in your local terminal, @@ -380,17 +383,20 @@ $ scp dcuser@ip.address:/home/dcuser/shell_data/untrimmed_fastq/scripted_bad_rea ``` Remember that in both instances, the command is run from your local machine, we've just flipped the order of the to and from parts of the command. -::::::::::::::::::::::::: +::::::::::::::::::::::: -::::::::::::::: solution +If you are using Windows without Git Bash on your local machine, you can use `pscp.exe` +to upload data to your virtual machine. -### Uploading Data to your Virtual Machine with PSCP on Windows with Putty +::::::::::::::: spoiler + +### PCSP If you're using a Windows PC without Git Bash, we recommend you use the *PSCP* program. This program is from the same suite of tools as the PuTTY program we have been using to connect. -1. If you haven't done so, download pscp from [http://the.earth.li/~sgtatham/putty/latest/x86/pscp.exe](https://the.earth.li/~sgtatham/putty/latest/x86/pscp.exe) +1. If you haven't done so, download *PSCP* from [http://the.earth.li/~sgtatham/putty/latest/x86/pscp.exe](https://the.earth.li/~sgtatham/putty/latest/x86/pscp.exe) 2. Make sure the *PSCP* program is somewhere you know on your computer. In this case, your Downloads folder is appropriate. 3. Open the windows [PowerShell](https://en.wikipedia.org/wiki/Windows_PowerShell); @@ -418,7 +424,8 @@ C:\User\your-pc-username\Downloads> pscp.exe dcuser@ec2-54-88-126-85.compute-1.a C:\User\your-pc-username\Downloads ``` -::::::::::::::::::::::::: + +::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::: keypoints @@ -426,5 +433,3 @@ C:\User\your-pc-username\Downloads - Transferring information to and from virtual and local computers. :::::::::::::::::::::::::::::::::::::::::::::::::: - -