From b45bf8b7751bfa43ae5ee2e7bc1d2fe23e6e73dd Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Tue, 20 Sep 2016 19:13:57 +0000 Subject: [PATCH 1/7] submission --- generate.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 51652b1..37fd3bb 100755 --- a/generate.sh +++ b/generate.sh @@ -2,4 +2,25 @@ set -ex -# YOUR CODE HERE +inputdir=$1/* +outputdir=$2 +if [ ! -d "$outputdir" ]; then + mkdir -p $outputdir +fi + +template=~/static/template.html +for i in $inputdir; do + lines=$(sed -n $= $i) + title=$(head -1 $i) + body=$(tail -n $(($lines-2)) $i) + + oldfilename=$(basename $i) + newfilename=$(echo $oldfilename | sed s/txt/html/) + + sed "s/{{title}}/$title/g" $template > $outputdir/$newfilename + sed -i "s/{{body}}/$body/g" $outputdir/$newfilename + + #extra credit + +done + From 76e2c2da76dcdf9a9caf12b6bedcc3782872c62f Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:15:12 +0000 Subject: [PATCH 2/7] some edit --- generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate.sh b/generate.sh index 37fd3bb..07ab397 100755 --- a/generate.sh +++ b/generate.sh @@ -12,6 +12,7 @@ template=~/static/template.html for i in $inputdir; do lines=$(sed -n $= $i) title=$(head -1 $i) + body=$(tail -n $(($lines-2)) $i) oldfilename=$(basename $i) @@ -22,5 +23,6 @@ for i in $inputdir; do #extra credit + done From 81ab76f4616b3d3e396cbc44083517f6f22d934b Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:26:26 +0000 Subject: [PATCH 3/7] change relative path --- generate.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 07ab397..fe47fa7 100755 --- a/generate.sh +++ b/generate.sh @@ -8,7 +8,7 @@ if [ ! -d "$outputdir" ]; then mkdir -p $outputdir fi -template=~/static/template.html +template=template.html for i in $inputdir; do lines=$(sed -n $= $i) title=$(head -1 $i) @@ -25,4 +25,9 @@ for i in $inputdir; do done + + + + + From 87c054785b9c1ce0056f7fcf427de73a4ab1ee4b Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:29:43 +0000 Subject: [PATCH 4/7] double quote --- generate.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/generate.sh b/generate.sh index fe47fa7..94d308c 100755 --- a/generate.sh +++ b/generate.sh @@ -2,24 +2,24 @@ set -ex -inputdir=$1/* -outputdir=$2 +inputdir="$1/*" +outputdir="$2" if [ ! -d "$outputdir" ]; then - mkdir -p $outputdir + mkdir -p "$outputdir" fi template=template.html -for i in $inputdir; do - lines=$(sed -n $= $i) - title=$(head -1 $i) +for i in "$inputdir"; do + lines="$(sed -n $= $i)" + title="$(head -1 $i)" - body=$(tail -n $(($lines-2)) $i) + body="$(tail -n $(($lines-2)) $i)" - oldfilename=$(basename $i) - newfilename=$(echo $oldfilename | sed s/txt/html/) + oldfilename="$(basename $i)" + newfilename="$(echo $oldfilename | sed s/txt/html/)" - sed "s/{{title}}/$title/g" $template > $outputdir/$newfilename - sed -i "s/{{body}}/$body/g" $outputdir/$newfilename + sed "s/{{title}}/$title/g" "$template" > "$outputdir/$newfilename" + sed -i "s/{{body}}/$body/g" "$outputdir/$newfilename" #extra credit From 360ae6d12827156847754687ef252fd28227a0d8 Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:32:40 +0000 Subject: [PATCH 5/7] fix code climate --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 94d308c..41bb8d3 100755 --- a/generate.sh +++ b/generate.sh @@ -16,7 +16,7 @@ for i in "$inputdir"; do body="$(tail -n $(($lines-2)) $i)" oldfilename="$(basename $i)" - newfilename="$(echo $oldfilename | sed s/txt/html/)" + newfilename="$oldfilename.html" sed "s/{{title}}/$title/g" "$template" > "$outputdir/$newfilename" sed -i "s/{{body}}/$body/g" "$outputdir/$newfilename" From 46d7567498cee0b63860ba04a37840a8af32c960 Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:48:37 +0000 Subject: [PATCH 6/7] fix bugs --- generate.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 41bb8d3..4fbdf80 100755 --- a/generate.sh +++ b/generate.sh @@ -9,13 +9,14 @@ if [ ! -d "$outputdir" ]; then fi template=template.html -for i in "$inputdir"; do +for i in $inputdir; do lines="$(sed -n $= $i)" title="$(head -1 $i)" body="$(tail -n $(($lines-2)) $i)" - oldfilename="$(basename $i)" + oldfilename="$(basename "$i" .txt)" + newfilename="$oldfilename.html" sed "s/{{title}}/$title/g" "$template" > "$outputdir/$newfilename" From 562b4e71c97f8ae7da96b9d0ca933b0c04999eaf Mon Sep 17 00:00:00 2001 From: 42lince <42.duxiaoxi@gmail.com> Date: Wed, 21 Sep 2016 18:50:37 +0000 Subject: [PATCH 7/7] fix code climate --- generate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate.sh b/generate.sh index 4fbdf80..6ef7b19 100755 --- a/generate.sh +++ b/generate.sh @@ -10,10 +10,10 @@ fi template=template.html for i in $inputdir; do - lines="$(sed -n $= $i)" - title="$(head -1 $i)" + lines="$(sed -n $= "$i")" + title="$(head -1 "$i")" - body="$(tail -n $(($lines-2)) $i)" + body="$(tail -n $((lines-2)) "$i")" oldfilename="$(basename "$i" .txt)"