From 4e8aed85f978c9f6141c8faa6e268e111fcee552 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:10:48 -0400 Subject: [PATCH 01/15] Update generate.sh --- generate.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 51652b1..c6d78e2 100755 --- a/generate.sh +++ b/generate.sh @@ -1,5 +1,25 @@ #!/bin/bash - +# ./generate.sh examples/simple/ output/ set -ex # YOUR CODE HERE +input_dir=$1 +output_dir=$2 +mkdir -p $output_dir # if not exist + + +for f in `ls $1` +do + title=`head -n1 $input_dir/$f` + body=`tail -n1 $input_dir/$f` + + html=`sed "s/{{title}}/$title/" template.html` + html=`echo $html | sed "s/{{body}}/$body/"` + + + f="${f%.*}" # wihout extension + newF=$output_dir$f.html + touch $newF + echo $html >> $newF + +done From bc6c68ed78eb628f3a7880223cd31ce52519501c Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:31:51 -0400 Subject: [PATCH 02/15] style check --- generate.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generate.sh b/generate.sh index c6d78e2..4d52670 100755 --- a/generate.sh +++ b/generate.sh @@ -5,16 +5,16 @@ set -ex # YOUR CODE HERE input_dir=$1 output_dir=$2 -mkdir -p $output_dir # if not exist +mkdir -p "$output_dir" # if not exist -for f in `ls $1` +for f in "$input_dir"/* do - title=`head -n1 $input_dir/$f` - body=`tail -n1 $input_dir/$f` + title=${head -n1 "$input_dir"/"$f"} + body=${tail -n1 "$input_dir"/"$f"} - html=`sed "s/{{title}}/$title/" template.html` - html=`echo $html | sed "s/{{body}}/$body/"` + html=${sed 's/{{title}}/"$title"/' template.html} + html=${echo "$html" | sed 's/{{body}}/"$body"/'} f="${f%.*}" # wihout extension From 4dbe9eb4c38282a38cb0805e5cf77db9dc5f1473 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:39:30 -0400 Subject: [PATCH 03/15] style check --- generate.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/generate.sh b/generate.sh index 4d52670..a83ebaa 100755 --- a/generate.sh +++ b/generate.sh @@ -10,11 +10,11 @@ mkdir -p "$output_dir" # if not exist for f in "$input_dir"/* do - title=${head -n1 "$input_dir"/"$f"} - body=${tail -n1 "$input_dir"/"$f"} + title=${head -n1 "$f"} + body=${tail -n1 "$f"} - html=${sed 's/{{title}}/"$title"/' template.html} - html=${echo "$html" | sed 's/{{body}}/"$body"/'} + html=${sed "s/{{title}}/$title/" template.html} + html=${echo "$html" | sed "s/{{body}}/$body/"} f="${f%.*}" # wihout extension @@ -23,3 +23,4 @@ do echo $html >> $newF done + From 55014e5a0077cfc3bc7cd3b4d904345b3c6012b1 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:45:56 -0400 Subject: [PATCH 04/15] Update generate.sh --- generate.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/generate.sh b/generate.sh index a83ebaa..3bd46e5 100755 --- a/generate.sh +++ b/generate.sh @@ -10,17 +10,16 @@ mkdir -p "$output_dir" # if not exist for f in "$input_dir"/* do - title=${head -n1 "$f"} - body=${tail -n1 "$f"} + title=$(head -n1 "$f") + body=$(tail -n1 "$f") - html=${sed "s/{{title}}/$title/" template.html} - html=${echo "$html" | sed "s/{{body}}/$body/"} + html=$(sed "s/{{title}}/$title/" template.html) + html=$(echo "$html" | sed "s/{{body}}/$body/") f="${f%.*}" # wihout extension - newF=$output_dir$f.html - touch $newF - echo $html >> $newF + newF="$output_dir$f.html" + touch "$newF" + echo "$html" >> "$newF" done - From b4dbf52cf20894a1c41ececa8ca6881a1a6bb261 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:49:35 -0400 Subject: [PATCH 05/15] Update generate.sh --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 3bd46e5..ef46001 100755 --- a/generate.sh +++ b/generate.sh @@ -13,8 +13,8 @@ do title=$(head -n1 "$f") body=$(tail -n1 "$f") - html=$(sed "s/{{title}}/$title/" template.html) - html=$(echo "$html" | sed "s/{{body}}/$body/") + html=$(sed -e "s/{{title}}/$title/" -e "s/{{body}}/$body/" template.html) + # html=$(echo "$html" | sed "s/{{body}}/$body/") f="${f%.*}" # wihout extension From 58ef578925d07fe6e4ef2d035fabc5ed835b421d Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 17:57:14 -0400 Subject: [PATCH 06/15] Update generate.sh --- generate.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/generate.sh b/generate.sh index ef46001..9416ca0 100755 --- a/generate.sh +++ b/generate.sh @@ -17,9 +17,8 @@ do # html=$(echo "$html" | sed "s/{{body}}/$body/") - f="${f%.*}" # wihout extension - newF="$output_dir$f.html" - touch "$newF" - echo "$html" >> "$newF" + f="${f%.*}".html # wihout extension + touch "$f" + echo "$html" >> "$f" done From 12b4072988c81124b04c65fb578ed9407b9b6e7a Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 18:29:21 -0400 Subject: [PATCH 07/15] Update generate.sh --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 9416ca0..e672370 100755 --- a/generate.sh +++ b/generate.sh @@ -13,12 +13,12 @@ do title=$(head -n1 "$f") body=$(tail -n1 "$f") - html=$(sed -e "s/{{title}}/$title/" -e "s/{{body}}/$body/" template.html) + html=$(sed -e 's/{{title}}/"$title"/' -e 's/{{body}}/"$body"/' template.html) # html=$(echo "$html" | sed "s/{{body}}/$body/") f="${f%.*}".html # wihout extension touch "$f" - echo "$html" >> "$f" + echo "$html" > "$f" done From 2aa58a3c8366f9bc78d09fec78e33882ead497b0 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 18:43:46 -0400 Subject: [PATCH 08/15] Update generate.sh --- generate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate.sh b/generate.sh index e672370..abb0200 100755 --- a/generate.sh +++ b/generate.sh @@ -13,12 +13,12 @@ do title=$(head -n1 "$f") body=$(tail -n1 "$f") - html=$(sed -e 's/{{title}}/"$title"/' -e 's/{{body}}/"$body"/' template.html) # html=$(echo "$html" | sed "s/{{body}}/$body/") f="${f%.*}".html # wihout extension - touch "$f" - echo "$html" > "$f" + # touch "$f" + sed -e 's/{{title}}/'"$title"'/g' -e 's/{{body}}/'"$body"'/g' template.html > "$f" + # sed -e 's/{{title}}/'"$title"'/g' -e 's/{{body}}/'"$body"'/g' template.html > "$f" done From d6c68557aabe0843d20f1e2a89c1122381844b91 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 19:01:15 -0400 Subject: [PATCH 09/15] Update generate.sh --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index abb0200..4640c4c 100755 --- a/generate.sh +++ b/generate.sh @@ -18,7 +18,7 @@ do f="${f%.*}".html # wihout extension # touch "$f" - sed -e 's/{{title}}/'"$title"'/g' -e 's/{{body}}/'"$body"'/g' template.html > "$f" - # sed -e 's/{{title}}/'"$title"'/g' -e 's/{{body}}/'"$body"'/g' template.html > "$f" + # sed -e 's/{{title}}/"$title"/g' 's/{{body}}/'"$body"'/g' template.html > "$f" + sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html > "$f" done From 746e6510f3a84be25733ffe9747c2090d313d26c Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 19:12:27 -0400 Subject: [PATCH 10/15] Update generate.sh --- generate.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/generate.sh b/generate.sh index 4640c4c..72724c1 100755 --- a/generate.sh +++ b/generate.sh @@ -15,10 +15,12 @@ do # html=$(echo "$html" | sed "s/{{body}}/$body/") - + f=$(basename "$f") f="${f%.*}".html # wihout extension - # touch "$f" + f="$output_dir$f.html" + touch "$f" # sed -e 's/{{title}}/"$title"/g' 's/{{body}}/'"$body"'/g' template.html > "$f" - sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html > "$f" + content=$(sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html) + echo "$content" > "$f" done From 8187a2684d1da3649291474a550662b7750e2a09 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 19:28:26 -0400 Subject: [PATCH 11/15] Update generate.sh --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 72724c1..b3e1628 100755 --- a/generate.sh +++ b/generate.sh @@ -17,7 +17,7 @@ do f=$(basename "$f") f="${f%.*}".html # wihout extension - f="$output_dir$f.html" + f="$output_dir$f" touch "$f" # sed -e 's/{{title}}/"$title"/g' 's/{{body}}/'"$body"'/g' template.html > "$f" content=$(sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html) From 86d02dc719063bca0493c3089004bfcbbc9763cc Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 21:53:49 -0400 Subject: [PATCH 12/15] Update generate.sh --- generate.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/generate.sh b/generate.sh index b3e1628..bf34b8a 100755 --- a/generate.sh +++ b/generate.sh @@ -1,11 +1,13 @@ #!/bin/bash # ./generate.sh examples/simple/ output/ -set -ex +# set -ex # YOUR CODE HERE input_dir=$1 output_dir=$2 -mkdir -p "$output_dir" # if not exist +if [ ! -d "$output_dir" ]; then + mkdir -p "$output_dir" +fi for f in "$input_dir"/* @@ -15,12 +17,13 @@ do # html=$(echo "$html" | sed "s/{{body}}/$body/") - f=$(basename "$f") - f="${f%.*}".html # wihout extension - f="$output_dir$f" - touch "$f" + f_name=$(basename "$f" .txt).html # without path + # f_name="${f%.*}".html # wihout extension + # f_name="$output_dir$f_name" # attch output path # sed -e 's/{{title}}/"$title"/g' 's/{{body}}/'"$body"'/g' template.html > "$f" - content=$(sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html) - echo "$content" > "$f" + sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html > "$output_dir$f_name" done + + + From 8b950b7a4db71cd66db87e2177baeff9a1c156d2 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 22:17:51 -0400 Subject: [PATCH 13/15] Update generate.sh --- generate.sh | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/generate.sh b/generate.sh index bf34b8a..6d48a46 100755 --- a/generate.sh +++ b/generate.sh @@ -1,29 +1,11 @@ -#!/bin/bash -# ./generate.sh examples/simple/ output/ -# set -ex - -# YOUR CODE HERE -input_dir=$1 -output_dir=$2 -if [ ! -d "$output_dir" ]; then - mkdir -p "$output_dir" -fi - - -for f in "$input_dir"/* +src=$1 +des=$2 +mkdir -p "$des" + +for file in $src/*.txt do - title=$(head -n1 "$f") - body=$(tail -n1 "$f") - - # html=$(echo "$html" | sed "s/{{body}}/$body/") - - f_name=$(basename "$f" .txt).html # without path - # f_name="${f%.*}".html # wihout extension - # f_name="$output_dir$f_name" # attch output path - # sed -e 's/{{title}}/"$title"/g' 's/{{body}}/'"$body"'/g' template.html > "$f" - sed "s@{{title}}@$title@g;s@{{body}}@$body@g" template.html > "$output_dir$f_name" - + title="$(head -n 1 "$file")" + body="$(tail -n +3 "$file")" + filename="$(basename "$file" .txt)" + sed 's#{{title}}#'"$title"'#g;s#{{body}}#'"$body"'#g' template.html > "$des"/"$filename".html done - - - From d5e1b568f249e4ae68a345b2e2b637ca2e916a93 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 22:47:05 -0400 Subject: [PATCH 14/15] Update generate.sh --- generate.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/generate.sh b/generate.sh index 6d48a46..eac13f8 100755 --- a/generate.sh +++ b/generate.sh @@ -1,11 +1,12 @@ -src=$1 -des=$2 -mkdir -p "$des" +#!/bin/bash +input_dir=$1 +output_dir=$2 +mkdir -p "$output_dir" -for file in $src/*.txt +for file in $input_dir/*.txt do title="$(head -n 1 "$file")" body="$(tail -n +3 "$file")" - filename="$(basename "$file" .txt)" - sed 's#{{title}}#'"$title"'#g;s#{{body}}#'"$body"'#g' template.html > "$des"/"$filename".html + filename="$(basename "$file" .txt)".html + sed 's#{{title}}#'"$title"'#g;s#{{body}}#'"$body"'#g' template.html > "$output_dir$filename" done From 71a4c0bb261b41438d34986c4ab06aae089bf2a8 Mon Sep 17 00:00:00 2001 From: Mingyu Zhang Date: Wed, 21 Sep 2016 23:40:24 -0400 Subject: [PATCH 15/15] Update generate.sh --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index eac13f8..ddb15d9 100755 --- a/generate.sh +++ b/generate.sh @@ -8,5 +8,5 @@ do title="$(head -n 1 "$file")" body="$(tail -n +3 "$file")" filename="$(basename "$file" .txt)".html - sed 's#{{title}}#'"$title"'#g;s#{{body}}#'"$body"'#g' template.html > "$output_dir$filename" + sed 's#{{title}}#'"$title"'#g;s#{{body}}#'"$body"'#g' template.html > "$output_dir"/"$filename" done