From d3b99b357aeeae3df55f8ab6cd81b16b2bc420da Mon Sep 17 00:00:00 2001 From: Abigail Midlige Date: Wed, 20 Sep 2017 12:17:24 -0400 Subject: [PATCH 01/17] Abbies favoirte movies --- movies.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 movies.txt diff --git a/movies.txt b/movies.txt new file mode 100644 index 0000000..e2fa1bc --- /dev/null +++ b/movies.txt @@ -0,0 +1,3 @@ +Good Will Hunting +ELf +Remember the Titans From 7b2cffbd267971c35539eafeaa59c028cd6d6ebe Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 12:21:32 -0400 Subject: [PATCH 02/17] Phil's Movies --- movies.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/movies.txt b/movies.txt index e2fa1bc..3f5cc0b 100644 --- a/movies.txt +++ b/movies.txt @@ -1,3 +1,6 @@ Good Will Hunting -ELf +Elf Remember the Titans +Shawshank Redemption +Godfather 1/2 +Interstellar From ce2e02e9e2b8490414963f82510564c37c13e3d8 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 12:24:21 -0400 Subject: [PATCH 03/17] Phil's Movies Ranked --- movies.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/movies.txt b/movies.txt index 3f5cc0b..2d9747a 100644 --- a/movies.txt +++ b/movies.txt @@ -1,6 +1,6 @@ Good Will Hunting -Elf -Remember the Titans Shawshank Redemption -Godfather 1/2 Interstellar +Remember the Titans +Godfather 1/2 +Elf From 86fe7dc8139cc51c253730e5a7de73c1809fdd90 Mon Sep 17 00:00:00 2001 From: Abigail Midlige Date: Wed, 20 Sep 2017 12:25:01 -0400 Subject: [PATCH 04/17] Abbies ranking --- movies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/movies.txt b/movies.txt index 3f5cc0b..f3834aa 100644 --- a/movies.txt +++ b/movies.txt @@ -1,6 +1,6 @@ Good Will Hunting -Elf -Remember the Titans Shawshank Redemption +Elf Godfather 1/2 +Remember the Titans Interstellar From 6949c4f73074f4bc96601afe081017d85b0d0127 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 14:42:21 -0400 Subject: [PATCH 05/17] Part 1 --- Exercise4.sh | 3 +++ Wages1.txt | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 Exercise4.sh create mode 100644 Wages1.txt diff --git a/Exercise4.sh b/Exercise4.sh new file mode 100644 index 0000000..b572653 --- /dev/null +++ b/Exercise4.sh @@ -0,0 +1,3 @@ +grep -w "female" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | unqi >> Wages1.txt +grep -w "male" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt + diff --git a/Wages1.txt b/Wages1.txt new file mode 100644 index 0000000..9b27a0a --- /dev/null +++ b/Wages1.txt @@ -0,0 +1,33 @@ +female 1 +female 2 +female 3 +female 4 +female 5 +female 6 +female 7 +female 8 +female 9 +female 10 +female 11 +female 12 +female 13 +female 14 +female 15 +female 16 +male 2 +male 3 +male 4 +male 5 +male 6 +male 7 +male 8 +male 9 +male 10 +male 11 +male 12 +male 13 +male 14 +male 15 +male 16 +male 17 +male 18 From 231fffadebbad0a3ebab47b019fa2e10f4e7f9c5 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 16:40:36 -0400 Subject: [PATCH 06/17] About halfway done with 4C --- Exercise4C.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Exercise4C.sh diff --git a/Exercise4C.sh b/Exercise4C.sh new file mode 100644 index 0000000..35df3e5 --- /dev/null +++ b/Exercise4C.sh @@ -0,0 +1,6 @@ +for wage in $1, $2 +do +#for input, go with the higher numbered term and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" +cut -d , -f1,3,4 wages.csv | grep -we "$1" | cut -d , -f3 | sort -rn | tail -n 1 +cut -d , -f1,3,4 wages.csv | grep -we "$2" | cut -d , -f3 | sort -rn | tail -n 1 +done From 6713a914796b932ce67be2cb9fa33619cc0698b5 Mon Sep 17 00:00:00 2001 From: pjlmac Date: Wed, 20 Sep 2017 17:37:33 -0400 Subject: [PATCH 07/17] Update Exercise4.sh --- Exercise4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise4.sh b/Exercise4.sh index b572653..378ec7b 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -1,3 +1,3 @@ -grep -w "female" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | unqi >> Wages1.txt +grep -w "female" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt grep -w "male" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt From d47b5abf97d0b703c9cae75d4b178f76bcc23a40 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 17:44:26 -0400 Subject: [PATCH 08/17] Trial and error fixing failed :( --- Exercise4C.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Exercise4C.sh b/Exercise4C.sh index 35df3e5..06e884b 100644 --- a/Exercise4C.sh +++ b/Exercise4C.sh @@ -1,6 +1,6 @@ for wage in $1, $2 do #for input, go with the higher numbered term and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" -cut -d , -f1,3,4 wages.csv | grep -we "$1" | cut -d , -f3 | sort -rn | tail -n 1 -cut -d , -f1,3,4 wages.csv | grep -we "$2" | cut -d , -f3 | sort -rn | tail -n 1 +cut -d , -f1,3,4 wages.csv | grep -we "$1" | cut -d , -f3 | sort -rn | tail -n 1 +cut -d , -f1,3,4 wages.csv | grep -we "$2" | cut -d , -f3 | sort -rn | tail -n 1 done From a62e23be28276c923bb4e044984c4e419d05933b Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Wed, 20 Sep 2017 23:26:20 -0400 Subject: [PATCH 09/17] Fixed Repeat Problem, now we need to subtract output --- Exercise4C.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Exercise4C.sh b/Exercise4C.sh index 06e884b..1a375a2 100644 --- a/Exercise4C.sh +++ b/Exercise4C.sh @@ -1,6 +1,6 @@ -for wage in $1, $2 +for wage in $@ do #for input, go with the higher numbered term and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" -cut -d , -f1,3,4 wages.csv | grep -we "$1" | cut -d , -f3 | sort -rn | tail -n 1 -cut -d , -f1,3,4 wages.csv | grep -we "$2" | cut -d , -f3 | sort -rn | tail -n 1 +cut -d , -f1,3,4 wages.csv | grep -we $wage | cut -d , -f3 | sort -rn | +tail -n 1 done From 16e7d7cfe7512e99665d39677da2be5fdf6821aa Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Thu, 21 Sep 2017 00:17:04 -0400 Subject: [PATCH 10/17] No change --- Exercise4C.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Exercise4C.sh b/Exercise4C.sh index 1a375a2..1d0ac4e 100644 --- a/Exercise4C.sh +++ b/Exercise4C.sh @@ -1,6 +1,6 @@ for wage in $@ do -#for input, go with the higher numbered term and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" -cut -d , -f1,3,4 wages.csv | grep -we $wage | cut -d , -f3 | sort -rn | -tail -n 1 +#for input, go with the higher numbered term first and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" +cut -d , -f1,3,4 wages.csv | grep -we $wage | cut -d , -f3 | sort -rn | tail -n 1 done + From d3fcd009e5a2d04bdbde88a5c989f6b57f5a3a81 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Thu, 21 Sep 2017 09:53:40 -0400 Subject: [PATCH 11/17] Fixed an attempted solution that didn't work --- Exercise4C.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Exercise4C.sh b/Exercise4C.sh index 1d0ac4e..99fceb1 100644 --- a/Exercise4C.sh +++ b/Exercise4C.sh @@ -3,4 +3,3 @@ do #for input, go with the higher numbered term first and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" cut -d , -f1,3,4 wages.csv | grep -we $wage | cut -d , -f3 | sort -rn | tail -n 1 done - From 1a3cf4afceebe60d64e5e06c572fe41bc2c84f5e Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Thu, 21 Sep 2017 11:29:51 -0400 Subject: [PATCH 12/17] Shell script that is the answer for 4C --- Exercise4C.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Exercise4C.sh b/Exercise4C.sh index 99fceb1..2cd15bd 100644 --- a/Exercise4C.sh +++ b/Exercise4C.sh @@ -1,5 +1,5 @@ -for wage in $@ -do #for input, go with the higher numbered term first and only using the format gender,yearsOfschooling, for example, "male,16" or "female,16" -cut -d , -f1,3,4 wages.csv | grep -we $wage | cut -d , -f3 | sort -rn | tail -n 1 -done +a=$(cut -d , -f1,3,4 wages.csv | grep -we "$1" | cut -d , -f3 | sort -rn | tail -n 1) +b=$(cut -d , -f1,3,4 wages.csv | grep -we "$2" | cut -d , -f3 | sort -rn | tail -n 1) +echo "$a-$b" | bc + From cf009adca684b11856ee889ff9f39fd003b775a9 Mon Sep 17 00:00:00 2001 From: Abigail Midlige Date: Thu, 21 Sep 2017 13:46:12 -0400 Subject: [PATCH 13/17] Shell Script for Question 4B --- exercise4B.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 exercise4B.sh diff --git a/exercise4B.sh b/exercise4B.sh new file mode 100644 index 0000000..8264fc1 --- /dev/null +++ b/exercise4B.sh @@ -0,0 +1,15 @@ +#To return the gender, yearsExperience, and wage of the lowest earner to stdout + +#To return the genfer, yearsExperience, and wage of the lowest earner to stdout + +#To return number of female wage earners to stdout + +var1=$(cat $filename | sort -k4 -n | cut -d ',' -f1,2,4 | head -n 2 | tail -n 1) +var2=$(cat $filename | sort -k4 -n -g | cut -d ',' -f1,2,4 | tail -n 1) +var3=$(cat $filename | sort -k4 -n -g | cut -d ',' -f1,2,4 | tail -n 10| grep -w "female" | wc -l) +echo $var1 $var2 $var3 + + + + + From b6671bc7df992ce5f96d1167a626e42ec75bcd30 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Thu, 21 Sep 2017 14:12:08 -0400 Subject: [PATCH 14/17] Renamed Exercise4.sh to Exercise4A.sh --- Exercise4A.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Exercise4A.sh diff --git a/Exercise4A.sh b/Exercise4A.sh new file mode 100644 index 0000000..378ec7b --- /dev/null +++ b/Exercise4A.sh @@ -0,0 +1,3 @@ +grep -w "female" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt +grep -w "male" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt + From 9b6923f6d7d49f0cf1065c7f594e92c6a3dd150e Mon Sep 17 00:00:00 2001 From: pjlmac Date: Thu, 21 Sep 2017 14:12:50 -0400 Subject: [PATCH 15/17] Delete Exercise4.sh --- Exercise4.sh | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 Exercise4.sh diff --git a/Exercise4.sh b/Exercise4.sh deleted file mode 100644 index 378ec7b..0000000 --- a/Exercise4.sh +++ /dev/null @@ -1,3 +0,0 @@ -grep -w "female" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt -grep -w "male" wages.csv | cut -d , -f1,2 | tr ',' ' ' | sort -n -k2 | uniq >> Wages1.txt - From 66fced2684794afa150de07a259664f99750212b Mon Sep 17 00:00:00 2001 From: pjlmac Date: Thu, 21 Sep 2017 14:15:27 -0400 Subject: [PATCH 16/17] Delete Wages1.txt --- Wages1.txt | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 Wages1.txt diff --git a/Wages1.txt b/Wages1.txt deleted file mode 100644 index 9b27a0a..0000000 --- a/Wages1.txt +++ /dev/null @@ -1,33 +0,0 @@ -female 1 -female 2 -female 3 -female 4 -female 5 -female 6 -female 7 -female 8 -female 9 -female 10 -female 11 -female 12 -female 13 -female 14 -female 15 -female 16 -male 2 -male 3 -male 4 -male 5 -male 6 -male 7 -male 8 -male 9 -male 10 -male 11 -male 12 -male 13 -male 14 -male 15 -male 16 -male 17 -male 18 From e48f39e2a834b4b7ee4290af2b3699a882082d47 Mon Sep 17 00:00:00 2001 From: Phil McCown Date: Thu, 21 Sep 2017 14:18:25 -0400 Subject: [PATCH 17/17] Accidentally purged Wages1.txt file --- Wages1.txt | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Wages1.txt diff --git a/Wages1.txt b/Wages1.txt new file mode 100644 index 0000000..9b27a0a --- /dev/null +++ b/Wages1.txt @@ -0,0 +1,33 @@ +female 1 +female 2 +female 3 +female 4 +female 5 +female 6 +female 7 +female 8 +female 9 +female 10 +female 11 +female 12 +female 13 +female 14 +female 15 +female 16 +male 2 +male 3 +male 4 +male 5 +male 6 +male 7 +male 8 +male 9 +male 10 +male 11 +male 12 +male 13 +male 14 +male 15 +male 16 +male 17 +male 18