Skip to content

Commit 23a9282

Browse files
committed
differences for PR #346
1 parent 3ce111f commit 23a9282

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

05-writing-scripts.md

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -330,16 +330,12 @@ using a transfer program, it needs to be installed on your local machine, not yo
330330

331331
## Transferring Data Between your Local Machine and the Cloud
332332

333-
If you're using Windows with PuTTY instead of Git Bash, please select the alternative option here:
334-
<select id="id_platform" name="platformlist" onchange="change_content_by_platform('id_platform');return false;">
333+
If you are using Linux, Mac OS, or Windows with Git Bash on your local machine, you can use
334+
`scp` to upload data to your virtual machine.
335335

336-
<option value="unix" id="id_unix" selected> Linux, Mac OS, Git Bash </option>
337-
<option value="win" id="id_win"> PuTTY </option>
338-
</select>
336+
::::::::::::::: spoiler
339337

340-
<div id="div_unix" style="display:block" markdown="1">
341-
342-
### Uploading Data to your Virtual Machine with scp
338+
### SCP
343339

344340
`scp` stands for 'secure copy protocol', and is a widely used UNIX tool for moving files
345341
between computers. The simplest way to use `scp` is to run it in your local terminal,
@@ -388,16 +384,19 @@ $ scp dcuser@ip.address:/home/dcuser/shell_data/untrimmed_fastq/scripted_bad_rea
388384

389385
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.
390386

391-
</div>
387+
:::::::::::::::::::::::
388+
389+
If you are using Windows without Git Bash on your local machine, you can use `pscp.exe`
390+
to upload data to your virtual machine.
392391

393-
<div id="div_win" style="display:block" markdown="1">
392+
::::::::::::::: spoiler
394393

395-
### Uploading Data to your Virtual Machine with PSCP
394+
### PCSP
396395

397396
If you're using a Windows PC without Git Bash, we recommend you use the *PSCP* program.
398397
This program is from the same suite of tools as the PuTTY program we have been using to connect.
399398

400-
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)
399+
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)
401400
2. Make sure the *PSCP* program is somewhere you know on your computer. In this case,
402401
your Downloads folder is appropriate.
403402
3. Open the windows [PowerShell](https://en.wikipedia.org/wiki/Windows_PowerShell);
@@ -426,13 +425,11 @@ C:\User\your-pc-username\Downloads> pscp.exe dcuser@ec2-54-88-126-85.compute-1.a
426425
C:\User\your-pc-username\Downloads
427426
```
428427

429-
</div>
428+
:::::::::::::::::::::::
430429

431430
:::::::::::::::::::::::::::::::::::::::: keypoints
432431

433432
- Scripts are a collection of commands executed together.
434433
- Transferring information to and from virtual and local computers.
435434

436435
::::::::::::::::::::::::::::::::::::::::::::::::::
437-
438-

md5sum.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"episodes/02-the-filesystem.md" "70b53ce6f53a88f931e492d876c60fa1" "site/built/02-the-filesystem.md" "2023-05-08"
88
"episodes/03-working-with-files.md" "6989deaa6d2a3b387212bff8b5d104f0" "site/built/03-working-with-files.md" "2023-05-08"
99
"episodes/04-redirection.md" "b9e1ebb605195fcdb9f32954ec9b9b1c" "site/built/04-redirection.md" "2023-05-08"
10-
"episodes/05-writing-scripts.md" "7873c1c4f1feab1f083cf9f0e53978aa" "site/built/05-writing-scripts.md" "2023-05-08"
10+
"episodes/05-writing-scripts.md" "e8e5ace52f12cd18b8dbb77cd200ea21" "site/built/05-writing-scripts.md" "2023-10-30"
1111
"episodes/06-organization.md" "6a657fb25cd386f2088145a440f2acc3" "site/built/06-organization.md" "2023-05-08"
1212
"instructors/Extra_lesson.md" "e60e20421674d8dc399eefce404e27f9" "site/built/Extra_lesson.md" "2023-05-08"
1313
"instructors/etherpad_template.md" "649e2e4831c6dc5d1675efce96da9bb6" "site/built/etherpad_template.md" "2023-09-27"

0 commit comments

Comments
 (0)