Skip to content

Commit 87e00a0

Browse files
authored
Merge pull request #201 from LibraryCarpentry/standardise-Unix-spelling
UNIX -> Unix
2 parents 92a0a00 + 48b17a9 commit 87e00a0

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Library Carpentry: The UNIX Shell
1+
# Library Carpentry: The Unix Shell
22

3-
## Maintainers for Library Carpentry: The UNIX Shell
3+
## Maintainers for Library Carpentry: The Unix Shell
44

55
- [Anna Oates](https://twitter.com/annaoates)
66
- [Jamie Jamison](https://github.com/jmjamison)

_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
carpentry: "lc"
1111

1212
# Overall title for pages.
13-
title: "Library Carpentry: The UNIX Shell"
13+
title: "Library Carpentry: The Unix Shell"
1414

1515
# Life cycle stage of the lesson
1616
# possible values: "pre-alpha", "alpha", "beta", "stable"

files/instructor-notes.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ wget github.com/LibraryCarpentry/lc-shell/raw/gh-pages/data/shell-lesson.zip
1313
unzip shell-lesson.zip
1414

1515
Before we had graphical interfaces we had command line interface
16-
UNIX Shell began in 1970s
16+
Unix Shell began in 1970s
1717
https://en.wikipedia.org/wiki/History_of_Unix#/media/File:Ken_Thompson_(sitting)_and_Dennis_Ritchie_at_PDP-11_(2876612463).jpg
1818
Work at a terminal but now you can work on your laptop or remotely
1919

@@ -23,7 +23,7 @@ Most popular version is BASH which we will be using
2323
Shell is still useful in programming, data science work, research computing
2424

2525
I've used Shell for wrangling with and cleaning lots of data/files
26-
Example: ORCID data dump via Figshare
26+
Example: ORCID data dump via Figshare
2727
https://orcid.figshare.com/articles/ORCID_Public_Data_File_2018/7234028
2828
Example: Mining journal article PDFs at the European Southern Observatory
2929
https://www.eso.org/sci/libraries/telbib_methodology.html
@@ -63,7 +63,7 @@ cd firstdirectory
6363
cd ..
6464

6565
ls -lh
66-
cat - concatenate files and print on the standard output
66+
cat - concatenate files and print on the standard output
6767
(in other words open and print a file to screen)
6868
type 82 + [TAB]
6969
cat 829-0.txt
@@ -74,7 +74,7 @@ What is the title of 829-0?
7474
ANSWER:
7575
GULLIVER’S TRAVELS
7676

77-
head
77+
head
7878
output the first part of files (first 10 lines)
7979
head 829-0.txt
8080

@@ -89,7 +89,7 @@ How can you return the last 30 lines of 829-0.txt?
8989
ANSWER:
9090
head -n20 829-0.txt
9191
tail -n30 829-0.txt
92-
Example: Sometimes files are too big to open and head and tail can be a lightweight way
92+
Example: Sometimes files are too big to open and head and tail can be a lightweight way
9393
to peak inside or to get header information in automated way.
9494

9595
less - allows you to scroll/page through file

index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ use shell commands to find and manipulate data.
99

1010
> ## Prerequisites
1111
>
12-
> To complete this lesson, you will need a UNIX-like shell environment -see [Setup]({{ page.root }}{% link setup.md %}). You will also need to download the file **[shell-lesson.zip](https://raw.githubusercontent.com/librarycarpentry/lc-shell/gh-pages/data/shell-lesson.zip)** from GitHub to your *desktop* and extract it there (once you have unzipped/extracted the file, you should end up with a folder called "shell-lesson").
12+
> To complete this lesson, you will need a Unix-like shell environment -see [Setup]({{ page.root }}{% link setup.md %}). You will also need to download the file **[shell-lesson.zip](https://raw.githubusercontent.com/librarycarpentry/lc-shell/gh-pages/data/shell-lesson.zip)** from GitHub to your *desktop* and extract it there (once you have unzipped/extracted the file, you should end up with a folder called "shell-lesson").
1313
{: .prereq}

setup.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ layout: page
33
title: Setup
44
---
55

6-
To participate in this Library Carpentry lesson, you will need a working UNIX-like shell environment.
6+
To participate in this Library Carpentry lesson, you will need a working Unix-like shell environment.
77
Specifically we will be using Bash ([Bourne Again Shell](https://en.wikipedia.org/wiki/Bash_(Unix_shell))) which is standard on Linux and macOS. macOS Catalina users will have zsh (Z shell) as their default version.
88
Even if you are a Windows user, learning Bash will open up a powerful set of tools on your personal machine, in addition to familiarizing you with the standard remote interface used on almost all servers and super computers.
99

1010
>## Terminal Setup
1111
>
1212
>Bash is the default shell on most Linux distributions and macOS.
13-
>Windows users will need to install Git Bash to provide a UNIX-like environment.
13+
>Windows users will need to install Git Bash to provide a Unix-like environment.
1414
>
1515
>- **Linux:** The default shell is usually Bash, but if your machine is set up differently you can run it by opening a terminal >and typing `bash`. There is no need to install anything. Look for Terminal in your applications to start the Bash shell.
1616
>- **macOS:** Bash is the default shell in all versions of macOS prior to Catalina, you do not need to install anything. Open Terminal from >`/Applications/Utilities` or spotlight search to start the Bash shell. zsh is the default in Catalina.
17-
>- **Windows:** On Windows, CMD or PowerShell are normally available as the default shell environments. These use a syntax and set of applications unique to Windows systems and are incompatible with the more widely used UNIX utilities. However, a Bash shell can be installed on Windows to provide a UNIX-like environment. For this lesson we suggest using Git Bash, part of the >[Git for Windows](https://gitforwindows.org/) package:
17+
>- **Windows:** On Windows, CMD or PowerShell are normally available as the default shell environments. These use a syntax and set of applications unique to Windows systems and are incompatible with the more widely used Unix utilities. However, a Bash shell can be installed on Windows to provide a Unix-like environment. For this lesson we suggest using Git Bash, part of the >[Git for Windows](https://gitforwindows.org/) package:
1818
> - Download the latest Git for Windows [installer](https://gitforwindows.org/).
1919
> - Double click the `.exe` to run the installer (for example, `Git-2.13.3-64-bit.exe`) using the default settings.
2020
> - Once installed, open the shell by selecting Git Bash from the start menu (in the Git folder).

0 commit comments

Comments
 (0)