From 85d7603068e17f893f117d7f3d6decc3a58f618b Mon Sep 17 00:00:00 2001 From: Devin Layne Shirley Date: Fri, 15 Sep 2017 10:53:22 -0400 Subject: [PATCH 1/8] Initial commit: 3 favorite movies --- favemovies.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 favemovies.txt diff --git a/favemovies.txt b/favemovies.txt new file mode 100644 index 0000000..6ba633a --- /dev/null +++ b/favemovies.txt @@ -0,0 +1,3 @@ +Two Towers +Gladiator +The Dark Knight From f9ed96b672e1097036ddbe59eab6f7c9de55eb75 Mon Sep 17 00:00:00 2001 From: Clay Conner Date: Fri, 15 Sep 2017 10:59:18 -0400 Subject: [PATCH 2/8] Add new movies --- favemovies.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/favemovies.txt b/favemovies.txt index 6ba633a..4831958 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,3 +1,6 @@ Two Towers Gladiator The Dark Knight +Inception +Dark Knight Rises +Fury From d797893ff3569860f054b37262f5f026416f98ce Mon Sep 17 00:00:00 2001 From: Clay Conner Date: Fri, 15 Sep 2017 11:03:37 -0400 Subject: [PATCH 3/8] Ranked movies in step 10 --- favemovies.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/favemovies.txt b/favemovies.txt index 4831958..e8a9d3e 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,6 +1,6 @@ -Two Towers -Gladiator -The Dark Knight Inception +The Two Towers +Gladiator +The Dark Knight Dark Knight Rises Fury From 40b041204325bee0e5fe7ef1da2b032b22049248 Mon Sep 17 00:00:00 2001 From: Devin Layne Shirley Date: Fri, 15 Sep 2017 11:04:34 -0400 Subject: [PATCH 4/8] Devin's Rankings Step 11 --- favemovies.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/favemovies.txt b/favemovies.txt index 4831958..8773b80 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,6 +1,6 @@ -Two Towers +Two Towers Gladiator -The Dark Knight -Inception +The Dark Knight Dark Knight Rises +Inception Fury From 41c2f18af93d3ddfb3b8c1e44224805b0fcf92d6 Mon Sep 17 00:00:00 2001 From: Devin Layne Shirley Date: Fri, 15 Sep 2017 12:24:49 -0400 Subject: [PATCH 5/8] Task 2; gives a few fun facts --- gender.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 gender.sh diff --git a/gender.sh b/gender.sh new file mode 100644 index 0000000..b45c5ed --- /dev/null +++ b/gender.sh @@ -0,0 +1,11 @@ +#Returns gender, yearsExperience, and wage for +#1 highest earner +#2 lowest earner +#3 number of females in the top 10 wage earners +#usage: bash gender.sh +echo 'highest earner' +cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | head -n 1 +echo 'lowest earner' +cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | tail -n 1 +echo 'number of females in the top 10 wage earners' +cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | head -n 10 | grep female | wc -l From 7fccfc4d9f37cfb2fc1bc55ed57a6a1d83d29084 Mon Sep 17 00:00:00 2001 From: Clay Conner Date: Sun, 17 Sep 2017 18:12:11 -0400 Subject: [PATCH 6/8] Task #1 script --- genderYears.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 genderYears.sh diff --git a/genderYears.sh b/genderYears.sh new file mode 100644 index 0000000..9ad715f --- /dev/null +++ b/genderYears.sh @@ -0,0 +1,3 @@ +cat "$1" | sed '1d'| cut -d, -f-1,2 | sort -ut"," -k1,1 -k2n,2 > "$2" + + From fac124d2a55a91fa54ad9af3f17cba8b053969bb Mon Sep 17 00:00:00 2001 From: Clay Conner Date: Sun, 17 Sep 2017 18:19:12 -0400 Subject: [PATCH 7/8] Updated with Task #1 that writes to an output file --- gender.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gender.sh b/gender.sh index b45c5ed..b5d1572 100644 --- a/gender.sh +++ b/gender.sh @@ -1,3 +1,15 @@ +# Takes wages.csv and... +#1) removes first row, +#2) only keeps gender and years experience columns, +#3) sorts unique gender/years experience combinations, +#4) and writes it to a filename of your choice + +#Usage: bash gender.sh + +cat wages.csv | sed '1d'| cut -d, -f-1,2 | sort -ut"," -k1,1 -k2n,2 > "$1" + + + #Returns gender, yearsExperience, and wage for #1 highest earner #2 lowest earner From 1dbdfda151da4a24cdcc1b84cac3c238155d2b51 Mon Sep 17 00:00:00 2001 From: Devin Layne Shirley Date: Tue, 19 Sep 2017 12:14:09 -0400 Subject: [PATCH 8/8] script now also gives minimum wages for college graduates and non-graduates --- gender.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gender.sh b/gender.sh index b5d1572..e3e2187 100644 --- a/gender.sh +++ b/gender.sh @@ -5,19 +5,25 @@ #4) and writes it to a filename of your choice #Usage: bash gender.sh - +echo 'Unique gender and yearsexperience cominations saved to' $1 cat wages.csv | sed '1d'| cut -d, -f-1,2 | sort -ut"," -k1,1 -k2n,2 > "$1" - - #Returns gender, yearsExperience, and wage for #1 highest earner #2 lowest earner #3 number of females in the top 10 wage earners -#usage: bash gender.sh -echo 'highest earner' + +echo 'highest earner:' cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | head -n 1 -echo 'lowest earner' +echo 'lowest earner:' cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | tail -n 1 -echo 'number of females in the top 10 wage earners' +echo 'number of females in the top 10 wage earners:' cat wages.csv | grep -v gender | sed 'y/,/ /' | sort -k 4 -n -r | head -n 10 | grep female | wc -l + +#demonstrates the effect of graduating college on minimum wage + +#college grad +cat wages.csv | sed 'y/,/ /' | awk '$3 == "16"' | cut -d " " -f 4 | awk '{s+=$1}END{print "average college graduate minimum wage:",s/NR}' + +#no college education +cat wages.csv | sed 'y/,/ /' | awk '$3 == "12"' | cut -d " " -f 4 | awk '{s+=$1}END{print "non-college graduate minimum wage:",s/NR}'