From f4754b04aa2192799df0978cf70b7c7f9147546b Mon Sep 17 00:00:00 2001 From: krajabi Date: Wed, 28 Sep 2016 23:09:31 +0000 Subject: [PATCH 1/6] submit3 --- generate.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 51652b1..fa6734a 100755 --- a/generate.sh +++ b/generate.sh @@ -2,4 +2,21 @@ set -ex -# YOUR CODE HERE +#make directory +mkdir -p $2 + +#set input +input="$1" + +#set output +output="$2" + +#pathname for the file +name=$(basename "$file".txt | cut -d -f1) + +#adjust name +for filename in $1/*.txt + do + title="$(head -n 1 "$file")" + body="$(tail -n + 3 "$file")" + sed -e 's/{{title}}/'"$title"'/ -e 's/{{body}}/'"$body"''/template.html > $2/"$output" \ No newline at end of file From f23d6c37fbabbfd4a684064327a18780025b811d Mon Sep 17 00:00:00 2001 From: krajabi Date: Thu, 29 Sep 2016 01:39:57 +0000 Subject: [PATCH 2/6] test --- generate.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/generate.sh b/generate.sh index fa6734a..81fab9a 100755 --- a/generate.sh +++ b/generate.sh @@ -3,20 +3,20 @@ set -ex #make directory -mkdir -p $2 +mkdir -p "$outputD" #set input -input="$1" +input=$1 #set output -output="$2" - -#pathname for the file -name=$(basename "$file".txt | cut -d -f1) +output=$2 #adjust name -for filename in $1/*.txt +for filename in "$1"/*; do - title="$(head -n 1 "$file")" - body="$(tail -n + 3 "$file")" - sed -e 's/{{title}}/'"$title"'/ -e 's/{{body}}/'"$body"''/template.html > $2/"$output" \ No newline at end of file + name=$(basename "$file".txt | cut -d -f1) + output="$file".txt + title=$(head -n 1 "$filename") + body=$(tail -n+3 "$filename") + sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$2"/"$file.html" +done From bd01fd5323070579a946c3d29e88ae3e54c8d87b Mon Sep 17 00:00:00 2001 From: krajabi Date: Thu, 29 Sep 2016 01:48:29 +0000 Subject: [PATCH 3/6] test5 --- generate.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/generate.sh b/generate.sh index 81fab9a..fa1ff8b 100755 --- a/generate.sh +++ b/generate.sh @@ -2,8 +2,11 @@ set -ex -#make directory -mkdir -p "$outputD" +#makeDir +if [ ! -d "$output" ]; + then + mkdir -p "$output" +fi #set input input=$1 @@ -11,12 +14,12 @@ input=$1 #set output output=$2 -#adjust name -for filename in "$1"/*; +#adjust name and create file +for filename in "$input"/*; do - name=$(basename "$file".txt | cut -d -f1) - output="$file".txt + name=$(basename "$filename".txt | cut -d -f1) + outputF="$name.html" title=$(head -n 1 "$filename") body=$(tail -n+3 "$filename") - sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$2"/"$file.html" + sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$output"/"$outputF" done From a70e446225e1b534a1f12598dbafcbc2b9eb21d2 Mon Sep 17 00:00:00 2001 From: krajabi Date: Thu, 29 Sep 2016 01:58:07 +0000 Subject: [PATCH 4/6] test6 --- generate.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/generate.sh b/generate.sh index fa1ff8b..1c2750b 100755 --- a/generate.sh +++ b/generate.sh @@ -3,9 +3,8 @@ set -ex #makeDir -if [ ! -d "$output" ]; - then - mkdir -p "$output" +if [ ! -d "$output" ]; + then mkdir -p "$output" fi #set input @@ -17,9 +16,9 @@ output=$2 #adjust name and create file for filename in "$input"/*; do - name=$(basename "$filename".txt | cut -d -f1) - outputF="$name.html" + filE=$(basename "$filename" .txt | cut -d -f1) + filE="$filE.html" title=$(head -n 1 "$filename") body=$(tail -n+3 "$filename") - sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$output"/"$outputF" + sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$output"/"$filE" done From 97355f94c241ed73809ba04cbd540bc433908c37 Mon Sep 17 00:00:00 2001 From: krajabi Date: Fri, 7 Oct 2016 22:58:49 +0000 Subject: [PATCH 5/6] test --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 1c2750b..4152906 100755 --- a/generate.sh +++ b/generate.sh @@ -16,8 +16,8 @@ output=$2 #adjust name and create file for filename in "$input"/*; do - filE=$(basename "$filename" .txt | cut -d -f1) - filE="$filE.html" + filE=$(basename "$filename" .txt) + filE="${filE%.*}" title=$(head -n 1 "$filename") body=$(tail -n+3 "$filename") sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$output"/"$filE" From dc57a9ac065db77ebaf6754c23a6c09b64420be0 Mon Sep 17 00:00:00 2001 From: krajabi Date: Tue, 11 Oct 2016 23:16:30 +0000 Subject: [PATCH 6/6] test6 --- generate.sh | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/generate.sh b/generate.sh index 4152906..a956c14 100755 --- a/generate.sh +++ b/generate.sh @@ -1,24 +1,31 @@ #!/bin/bash - set -ex -#makeDir -if [ ! -d "$output" ]; - then mkdir -p "$output" -fi - #set input input=$1 #set output output=$2 +#makeDir +if [ ! -d "$output" ]; + then mkdir -p "$output" +fi + + #adjust name and create file -for filename in "$input"/*; +for filename in $input/*.txt; do - filE=$(basename "$filename" .txt) - filE="${filE%.*}" - title=$(head -n 1 "$filename") - body=$(tail -n+3 "$filename") - sed -e 's/{{title}}/'"$title"'/' -e 's/{{body}}/'"$body"'/' template.html >> "$output"/"$filE" + filE="$(basename "${filename%.*}")".html; + #title + title=$(head -n 1 "$filename"); + #body + body=$(tail -n+3 "$filename"); + + #cat template + cat template.html > "$output/$filE"; + + #replace + sed -i -e "s,{{title}}, $title,g" "$output/$filE"; + sed -i -e "s,{{body}}, $body,g" "$output/$filE"; done