From a40d8b02cfdeb2e1de721cf9e7fc4ed08277903d Mon Sep 17 00:00:00 2001 From: Shuyue Li Date: Fri, 28 Sep 2018 11:01:46 -0400 Subject: [PATCH 1/8] Created a file containing three favorite movies --- favorite_movies.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 favorite_movies.txt diff --git a/favorite_movies.txt b/favorite_movies.txt new file mode 100644 index 0000000..52aa49d --- /dev/null +++ b/favorite_movies.txt @@ -0,0 +1,3 @@ +La La Land +The Lion King +Hacksaw Ridge From 2f810aee6a8c428ff5a74cc023cebdc923e46388 Mon Sep 17 00:00:00 2001 From: Annaliese Wieler Date: Fri, 28 Sep 2018 11:07:44 -0400 Subject: [PATCH 2/8] added my favorite movies --- favorite_movies.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/favorite_movies.txt b/favorite_movies.txt index 52aa49d..98a2d9c 100644 --- a/favorite_movies.txt +++ b/favorite_movies.txt @@ -1,3 +1,6 @@ La La Land The Lion King Hacksaw Ridge +Casablanca +Greatest Showman +Hunchback of Notre Dame From bb5a983277b670488481150c9cfcdb85b46b0291 Mon Sep 17 00:00:00 2001 From: Annaliese Wieler Date: Fri, 28 Sep 2018 11:10:28 -0400 Subject: [PATCH 3/8] ranked my favorites --- favorite_movies.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/favorite_movies.txt b/favorite_movies.txt index 98a2d9c..374ccf7 100644 --- a/favorite_movies.txt +++ b/favorite_movies.txt @@ -1,6 +1,6 @@ +Greatest Showman +Hunchback of Notre Dame +Casablanca La La Land The Lion King Hacksaw Ridge -Casablanca -Greatest Showman -Hunchback of Notre Dame From 780035781f3f30f0777b69bf0aa1ccce7a6be04b Mon Sep 17 00:00:00 2001 From: Shuyue Li Date: Fri, 28 Sep 2018 11:12:11 -0400 Subject: [PATCH 4/8] Rank the movies by collaborator --- favorite_movies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/favorite_movies.txt b/favorite_movies.txt index 98a2d9c..9b860eb 100644 --- a/favorite_movies.txt +++ b/favorite_movies.txt @@ -1,6 +1,6 @@ La La Land The Lion King -Hacksaw Ridge Casablanca -Greatest Showman Hunchback of Notre Dame +Hacksaw Ridge +Greatest Showman From becbfa1a5ee2d476e067a2815d773895fb17a15e Mon Sep 17 00:00:00 2001 From: Shuyue Li Date: Mon, 1 Oct 2018 12:44:06 -0400 Subject: [PATCH 5/8] Task 2 script added --- task2.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 task2.sh diff --git a/task2.sh b/task2.sh new file mode 100644 index 0000000..2d6673d --- /dev/null +++ b/task2.sh @@ -0,0 +1,9 @@ +# This script is for IBC_EX5 Task 2 +# Usage: bash task2.sh . + +echo "Highest earner:" +cat wages.csv | sort -n -r -t , -k 4 | head -n 1 +echo "Lowest earner:" +cat wages.csv | sort -n -t , -k 4 | head -n 2 | tail -n 1 +echo "The number of females in top ten earners:" +cat wages.csv | sort -n -r -t , -k 4 | head -n 11 | tail -n 10 | grep female | wc -l From 5eb9d6f7f4c26f880285101f9115e589caa103dc Mon Sep 17 00:00:00 2001 From: Annaliese Wieler Date: Mon, 1 Oct 2018 12:47:07 -0400 Subject: [PATCH 6/8] Added Part 1 --- exercisescript.sh | 1 + task2.sh | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 exercisescript.sh diff --git a/exercisescript.sh b/exercisescript.sh new file mode 100644 index 0000000..6752484 --- /dev/null +++ b/exercisescript.sh @@ -0,0 +1 @@ +cat wages.csv | cut -f 1,2 -d , | sort | sed -E 's/,/ /g' | sort -k 2 -n | uniq > unique.txt diff --git a/task2.sh b/task2.sh index 2d6673d..423b270 100644 --- a/task2.sh +++ b/task2.sh @@ -7,3 +7,5 @@ echo "Lowest earner:" cat wages.csv | sort -n -t , -k 4 | head -n 2 | tail -n 1 echo "The number of females in top ten earners:" cat wages.csv | sort -n -r -t , -k 4 | head -n 11 | tail -n 10 | grep female | wc -l +cat wages.csv | cut -f 1,2 -d , | sort | sed -E 's/,/ /g' | sort -k 2 -n | uniq > unique.txt + From 4a6ff544937c47dcb3b5573fbc933a5ae9552944 Mon Sep 17 00:00:00 2001 From: Annaliese Wieler Date: Mon, 1 Oct 2018 13:01:11 -0400 Subject: [PATCH 7/8] Added Part 3 --- task2.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/task2.sh b/task2.sh index 423b270..90c8bf8 100644 --- a/task2.sh +++ b/task2.sh @@ -8,4 +8,6 @@ cat wages.csv | sort -n -t , -k 4 | head -n 2 | tail -n 1 echo "The number of females in top ten earners:" cat wages.csv | sort -n -r -t , -k 4 | head -n 11 | tail -n 10 | grep female | wc -l cat wages.csv | cut -f 1,2 -d , | sort | sed -E 's/,/ /g' | sort -k 2 -n | uniq > unique.txt - +var1 = $(cat wages.csv | cut -f 3,4 -d , | grep -E ^12 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") +var2 = $(cat wages.csv | cut -f 3,4 -d , | grep -E ^16 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") +echo "$var2 - $var1" | bc From 680748ab93a386d0e365b675ef85208bb134acd3 Mon Sep 17 00:00:00 2001 From: Shuyue Li Date: Mon, 1 Oct 2018 13:06:57 -0400 Subject: [PATCH 8/8] Command for task 3 added --- task2.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/task2.sh b/task2.sh index 90c8bf8..d13e696 100644 --- a/task2.sh +++ b/task2.sh @@ -8,6 +8,7 @@ cat wages.csv | sort -n -t , -k 4 | head -n 2 | tail -n 1 echo "The number of females in top ten earners:" cat wages.csv | sort -n -r -t , -k 4 | head -n 11 | tail -n 10 | grep female | wc -l cat wages.csv | cut -f 1,2 -d , | sort | sed -E 's/,/ /g' | sort -k 2 -n | uniq > unique.txt -var1 = $(cat wages.csv | cut -f 3,4 -d , | grep -E ^12 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") -var2 = $(cat wages.csv | cut -f 3,4 -d , | grep -E ^16 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") -echo "$var2 - $var1" | bc +var1=$(cat wages.csv | cut -f 3,4 -d , | grep -E ^12 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") +var2=$(cat wages.csv | cut -f 3,4 -d , | grep -E ^16 | sort -n -k 2 | sed -E 's/,/ /g' | sort -k 2 -n | head -n 1 | cut -f 2 -d " ") +echo "Difference in minimum wages between 12 and 16 years of education:" +echo "$var2 - $var1" | bc