Revert mistaken commits from main branch

Fradoka · Fradoka · commit 4ef88e262b96 · 2025-07-31T15:11:57.000+01:00
diff --git a/individual-shell-tools/awk/script-01.sh b/individual-shell-tools/awk/script-01.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output just the names of each player in `scores-table.txt`.
 # Your output should contain 6 lines, each with just one word on it.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{print $1}' $path
diff --git a/individual-shell-tools/awk/script-02.sh b/individual-shell-tools/awk/script-02.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the names of each player, as well as their city.
 # Your output should contain 6 lines, each with two words on it, separated by a space.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{print $1, $2}' $path
diff --git a/individual-shell-tools/awk/script-03.sh b/individual-shell-tools/awk/script-03.sh
@@ -5,5 +5,3 @@ set -euo pipefail
 # TODO: Write a command to output just the names of each player along with the score from their first attempt.
 # Your output should contain 6 lines, each with one word and one number on it.
 # The first line should be "Ahmed 1".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{print $1, $3}' $path
diff --git a/individual-shell-tools/awk/script-04.sh b/individual-shell-tools/awk/script-04.sh
@@ -5,5 +5,3 @@ set -euo pipefail
 # TODO: Write a command to output just the names of each player in London along with the score from their last attempt.
 # Your output should contain 3 lines, each with one word and one number on it.
 # The first line should be "Ahmed 4".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '/London/ {print $1, $NF}' $path
diff --git a/individual-shell-tools/awk/script-05.sh b/individual-shell-tools/awk/script-05.sh
@@ -5,5 +5,3 @@ set -euo pipefail
 # TODO: Write a command to output just the names of each player along with the number of times they've played the game.
 # Your output should contain 6 lines, each with one word and one number on it.
 # The first line should be "Ahmed 3".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{print $1, NF-2}' $path
diff --git a/individual-shell-tools/awk/script-06-stretch.sh b/individual-shell-tools/awk/script-06-stretch.sh
@@ -6,5 +6,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the total of adding together all players' first scores.
 # Your output should be exactly the number 54.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{sum += $3} END {print sum}' $path
diff --git a/individual-shell-tools/awk/script-07-stretch.sh b/individual-shell-tools/awk/script-07-stretch.sh
@@ -7,9 +7,3 @@ set -euo pipefail
 # TODO: Write a command to output just the names of each player along with the total of adding all of that player's scores.
 # Your output should contain 6 lines, each with one word and one number on it.
 # The first line should be "Ahmed 15". The second line should be "Basia 37"
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/awk/scores-table.txt"
-awk '{
-  sum = 0
-  for (i = 3; i <= NF; i++) sum += $i} {
-  print $1, sum
-}' $path
diff --git a/individual-shell-tools/cat/script-01.sh b/individual-shell-tools/cat/script-01.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the contents of the helper-1.txt file inside the helper-files directory to the terminal.
 # The output of this command should be "Once upon a time...".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files/helper-1.txt"
-cat "$path"
diff --git a/individual-shell-tools/cat/script-02.sh b/individual-shell-tools/cat/script-02.sh
@@ -11,5 +11,3 @@ set -euo pipefail
 # It looked delicious.
 # I was tempted to take a bite of it.
 # But this seemed like a bad idea...
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files"
-cat "$path"/*.txt
diff --git a/individual-shell-tools/cat/script-03.sh b/individual-shell-tools/cat/script-03.sh
@@ -9,5 +9,3 @@ set -euo pipefail
 # 1 It looked delicious.
 # 2 I was tempted to take a bite of it.
 # 3 But this seemed like a bad idea...
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files/helper-3.txt"
-cat -n "$path"
diff --git a/individual-shell-tools/cat/script-04-stretch.sh b/individual-shell-tools/cat/script-04-stretch.sh
@@ -13,5 +13,3 @@ set -euo pipefail
 # 3 It looked delicious.
 # 4 I was tempted to take a bite of it.
 # 5 But this seemed like a bad idea...
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files"
-cat "$path"/*.txt | cat -n
diff --git a/individual-shell-tools/grep/script-01.sh b/individual-shell-tools/grep/script-01.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output every line in dialogue.txt said by the Doctor.
 # The output should contain 6 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/dialogue.txt"
-grep '^Doctor:' "$path"
diff --git a/individual-shell-tools/grep/script-02.sh b/individual-shell-tools/grep/script-02.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output every line in dialogue.txt that contains the word Doctor (regardless of case).
 # The output should contain 9 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/dialogue.txt"
-grep -i 'Doctor' "$path"
diff --git a/individual-shell-tools/grep/script-03.sh b/individual-shell-tools/grep/script-03.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the number of lines in dialogue.txt that contain the word Doctor (regardless of case).
 # The output should be exactly the number 9.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/dialogue.txt"
-grep -i 'Doctor' "$path" | wc -l
diff --git a/individual-shell-tools/grep/script-04.sh b/individual-shell-tools/grep/script-04.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output every line in dialogue.txt that does not contain the word "Hello" (regardless of case).
 # The output should contain 10 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/dialogue.txt"
-grep -vi 'Hello' "$path"
diff --git a/individual-shell-tools/grep/script-05.sh b/individual-shell-tools/grep/script-05.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output every line in dialogue.txt that contains the string "cure", as well as the line before that line.
 # The output should contain two pairs of two lines of text (with a separator between them).
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/dialogue.txt"
-grep -B 1 'cure' "$path"
diff --git a/individual-shell-tools/grep/script-06.sh b/individual-shell-tools/grep/script-06.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the name of every `.txt` file in this directory which contains a line of dialogue said by the Doctor.
 # The output should contain two filenames.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep"
-grep -l '^Doctor:' "$path"/*.txt 
diff --git a/individual-shell-tools/grep/script-07.sh b/individual-shell-tools/grep/script-07.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output, for each `.txt` file in this directory, how many lines of dialogue the Doctor has.
 # The output should show that dialogue.txt contains 6 lines, dialogue-2.txt contains 2, and dialogue-3.txt contains 0.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/grep/"
-grep -c '^Doctor:' "$path"*.txt | sed "s|$path||"
diff --git a/individual-shell-tools/ls/script-01.sh b/individual-shell-tools/ls/script-01.sh
@@ -13,6 +13,3 @@ fi
 
 # TODO: Write a command to list the files and folders in this directory.
 # The output should be a list of names including child-directory, script-01.sh, script-02.sh, and more.
-
-thisDir="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/ls"
-ls "$thisDir"
diff --git a/individual-shell-tools/ls/script-02.sh b/individual-shell-tools/ls/script-02.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command which lists all of the files in the directory named child-directory.
 # The output should be a list of names: helper-1.txt, helper-2.txt, helper-3.txt.
-thisDir="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/ls/child-directory"
-ls "$thisDir"
diff --git a/individual-shell-tools/ls/script-03.sh b/individual-shell-tools/ls/script-03.sh
@@ -5,4 +5,3 @@ set -euo pipefail
 # TODO: Write a command which _recursively_ lists all of the files and folders in this directory _and_ all of the files inside those folders.
 # The output should be a list of names including: child-directory, script-01.sh, helper-1.txt (and more).
 # The formatting of the output doesn't matter.
-find .
diff --git a/individual-shell-tools/ls/script-04.sh b/individual-shell-tools/ls/script-04.sh
@@ -15,12 +15,9 @@ echo "First exercise (sorted newest to oldest):"
 
 # TODO: Write a command which lists the files in the child-directory directory, one per line, sorted so that the most recently modified file is first.
 # The output should be a list of names in this order, one per line: helper-3.txt, helper-1.txt, helper-2.txt.
-thisDir="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/ls/child-directory"
-ls -1t "$thisDir"
+
 
 echo "Second exercise (sorted oldest to newest):"
 
 # TODO: Write a command which does the same as above, but sorted in the opposite order (oldest first).
 # The output should be a list of names in this order, one per line: helper-2.txt, helper-1.txt, helper-3.txt.
-thisDir="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/ls/child-directory"
-ls -1tr "$thisDir"
diff --git a/individual-shell-tools/sed/script-01.sh b/individual-shell-tools/sed/script-01.sh
@@ -5,5 +5,3 @@ set -euo pipefail
 # TODO: Write a command to output input.txt with all occurrences of the letter `i` replaced with `I`.
 # The output should contain 11 lines.
 # The first line of the output should be: "ThIs Is a sample fIle for experImentIng with sed.".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-sed 's/i/I/g' $path
diff --git a/individual-shell-tools/sed/script-02.sh b/individual-shell-tools/sed/script-02.sh
@@ -5,5 +5,3 @@ set -euo pipefail
 # TODO: Write a command to output input.txt with numbers removed.
 # The output should contain 11 lines.
 # Line 6 of the output should be " Alisha".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-sed "s/[0-9]//g" $path
diff --git a/individual-shell-tools/sed/script-03.sh b/individual-shell-tools/sed/script-03.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output input.txt removing any line which contains a number.
 # The output should contain 6 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-sed "/[0-9]/d" $path
diff --git a/individual-shell-tools/sed/script-04.sh b/individual-shell-tools/sed/script-04.sh
@@ -4,7 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output input.txt replacing every occurrence of the string "We'll" with "We will".
 # The output should contain 11 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-old="We'll"
-new="We will"
-sed "s/$old/$new/g" $path
diff --git a/individual-shell-tools/sed/script-05.sh b/individual-shell-tools/sed/script-05.sh
@@ -6,5 +6,3 @@ set -euo pipefail
 # If a line starts with a number and a space, make the line instead end with a space and the number.
 # So line 6 which currently reads "37 Alisha" should instead read "Alisha 37".
 # The output should contain 11 lines.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-sed -E 's/^([0-9]+) (.*)/\2 \1/' $path
diff --git a/individual-shell-tools/sed/script-06.sh b/individual-shell-tools/sed/script-06.sh
@@ -8,5 +8,3 @@ set -euo pipefail
 # The output should contain 11 lines.
 # Line 3 should be "It contains many lines, and there are some things you may want to do with each of them.".
 # Line 11 should be "We also should remember, when we go shopping, to get 4 items: oranges, cheese, bread, olives.".
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/sed/input.txt"
-sed -E 's/, ?/, /g' $path
diff --git a/individual-shell-tools/wc/script-01.sh b/individual-shell-tools/wc/script-01.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the number of words in the file helper-files/helper-3.txt.
 # The output should include the number 19. The output should not include the number 92.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files/helper-3.txt"
-wc -w "$path"
diff --git a/individual-shell-tools/wc/script-02.sh b/individual-shell-tools/wc/script-02.sh
@@ -4,5 +4,3 @@ set -euo pipefail
 
 # TODO: Write a command to output the number of lines in the file helper-files/helper-3.txt.
 # The output should include the number 3. The output should not include the number 19.
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files/helper-3.txt"
-wc -l "$path"
diff --git a/individual-shell-tools/wc/script-03.sh b/individual-shell-tools/wc/script-03.sh
@@ -8,5 +8,3 @@ set -euo pipefail
 #        1       7      39 ../helper-files/helper-2.txt
 #        3      19      92 ../helper-files/helper-3.txt
 #        5      30     151 total
-path="/Users/cyf/Documents/SDC/Module-Tools/individual-shell-tools/helper-files"
-wc "$path"/*.txt
diff --git a/number-systems/README.md b/number-systems/README.md
@@ -5,61 +5,61 @@ Do not convert any binary numbers to decimal when solving a question unless the
 The goal of these exercises is for you to gain an intuition for binary numbers. Using tools to solve the problems defeats the point.
 
 Convert the decimal number 14 to binary.
-Answer:1110
+Answer:
 
 Convert the binary number 101101 to decimal:
-Answer:45
+Answer:
 
 Which is larger: 1000 or 0111?
-Answer:1000
+Answer:
 
 Which is larger: 00100 or 01011?
-Answer:01011
+Answer:
 
 What is 10101 + 01010?
-Answer:11111
+Answer:
 
 What is 10001 + 10001?
-Answer:100010
+Answer:
 
 What's the largest number you can store with 4 bits, if you want to be able to represent the number 0?
-Answer:15 or 0b1111
+Answer:
 
 How many bits would you need in order to store the numbers between 0 and 255 inclusive?
-Answer:8 bits (255 in base 2 is 0b11111111)
+Answer:
 
 How many bits would you need in order to store the numbers between 0 and 3 inclusive?
-Answer:2 bits (3 in base 2 is 0b11)
+Answer:
 
 How many bits would you need in order to store the numbers between 0 and 1000 inclusive?
-Answer:10 bits (1000 in base 2 is 0b1111101000)
+Answer:
 
 How can you test if a binary number is a power of two (e.g. 1, 2, 4, 8, 16, ...)?
-Answer:a binary number is a power of 2 if it has exactly one "1" bit in its representation.
+Answer:
 
 Convert the decimal number 14 to hex.
-Answer:E
+Answer:
 
 Convert the decimal number 386 to hex.
-Answer:182
+Answer:
 
 Convert the hex number 386 to decimal.
-Answer:902
+Answer:
 
 Convert the hex number B to decimal.
-Answer:11
+Answer:
 
 If reading the byte 0x21 as a number, what decimal number would it mean?
-Answer:33
+Answer:
 
 If reading the byte 0x21 as an ASCII character, what character would it mean?
-Answer:!
+Answer:
 
 If reading the byte 0x21 as a greyscale colour, as described in "Approaches for Representing Colors and Images", what colour would it mean?
-Answer:Dark shade of gray
+Answer:
 
 If reading the bytes 0xAA00FF as an RGB colour, as described in "Approaches for Representing Colors and Images", what colour would it mean?
-Answer:(RGB 170, 0, 255) high red, no green, maximum blue.
+Answer:
 
 If reading the bytes 0xAA00FF as a sequence of three one-byte decimal numbers, what decimal numbers would they be?
-Answer:170, 0, 255
+Answer:
