From 3cece1af0c3f7869ce6d7278cc88e18c9e9340fc Mon Sep 17 00:00:00 2001 From: elyapardes Date: Wed, 21 Sep 2016 13:33:11 -0400 Subject: [PATCH 1/5] Update generate.sh --- generate.sh | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 51652b1..a11b15e 100755 --- a/generate.sh +++ b/generate.sh @@ -1,5 +1,33 @@ #!/bin/bash -set -ex +FILES="$1/*.txt" +DEST=$2 +mkdir -p "$DEST" +for f in $FILES +do +# echo "Processing $f file..." + # take action on each file. $f store current file name +# cat $f -# YOUR CODE HERE + # Parsing doc + headerline=$(head -1 "$f") + restofdoc=$(tail -n +2 "$f") + # end of parsing doc + filename=$(basename "$f") + filename="${filename%.*}" + # Copy html file + cp template.html "$DEST"/"$filename".html + + # Replace +# sed -i "/{{title}}/c \\${headerline}1" "$DEST"/"$filename".html +# sed 's/{{title}}/'$headerline/ "$DEST"/"$filename".html + sed -i -e "s/{{title}}/$headerline/g" "$DEST"/"$filename".html + sed -i -e "s/{{body}}/$restofdoc/g" "$DEST"/"$filename".html + +done +#cat template.html + +# ls Desktop\Dropbox\CT\Sys\startup-systems\vm\static +# ./generate.sh examples/simple/ output/ +# Always have to run: sed -i 's/\r$//' testscript +# for dos2unix From ab8a264cd868b0a9761b384151c51d2e0f41efa3 Mon Sep 17 00:00:00 2001 From: elyapardes Date: Wed, 21 Sep 2016 13:36:19 -0400 Subject: [PATCH 2/5] try --- generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate.sh b/generate.sh index a11b15e..f42b0df 100755 --- a/generate.sh +++ b/generate.sh @@ -1,5 +1,7 @@ #!/bin/bash + + FILES="$1/*.txt" DEST=$2 mkdir -p "$DEST" From 8abb16e50f9fb8feb81c628dc4a80956da8ea2d8 Mon Sep 17 00:00:00 2001 From: elyapardes Date: Wed, 21 Sep 2016 13:42:46 -0400 Subject: [PATCH 3/5] Updated to satisfy output test May have code climate issue --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index f42b0df..da854ca 100755 --- a/generate.sh +++ b/generate.sh @@ -23,7 +23,7 @@ do # Replace # sed -i "/{{title}}/c \\${headerline}1" "$DEST"/"$filename".html # sed 's/{{title}}/'$headerline/ "$DEST"/"$filename".html - sed -i -e "s/{{title}}/$headerline/g" "$DEST"/"$filename".html + sed -i "s/{{title}}/$(echo $headerline)/g" "$DEST"/"$filename".html sed -i -e "s/{{body}}/$restofdoc/g" "$DEST"/"$filename".html done From f94437174a95912f92704e23a73791071ceb58a8 Mon Sep 17 00:00:00 2001 From: elyapardes Date: Wed, 21 Sep 2016 13:56:04 -0400 Subject: [PATCH 4/5] Passed tests Should pass both python and code climate --- generate.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/generate.sh b/generate.sh index da854ca..d7fb01b 100755 --- a/generate.sh +++ b/generate.sh @@ -1,7 +1,5 @@ #!/bin/bash - - FILES="$1/*.txt" DEST=$2 mkdir -p "$DEST" @@ -13,7 +11,7 @@ do # Parsing doc headerline=$(head -1 "$f") - restofdoc=$(tail -n +2 "$f") + restofdoc=$(tail -n +3 "$f") # end of parsing doc filename=$(basename "$f") filename="${filename%.*}" @@ -23,8 +21,8 @@ do # Replace # sed -i "/{{title}}/c \\${headerline}1" "$DEST"/"$filename".html # sed 's/{{title}}/'$headerline/ "$DEST"/"$filename".html - sed -i "s/{{title}}/$(echo $headerline)/g" "$DEST"/"$filename".html - sed -i -e "s/{{body}}/$restofdoc/g" "$DEST"/"$filename".html + sed -i "s/{{title}}/${headerline}/" "$DEST"/"$filename".html + sed -i -e "s/{{body}}/${restofdoc}/g" "$DEST"/"$filename".html done #cat template.html From 2c84f622ddf8d5cba7f609941867cdc651bf5b42 Mon Sep 17 00:00:00 2001 From: elyapardes Date: Wed, 21 Sep 2016 14:38:44 -0400 Subject: [PATCH 5/5] Passed tests hl works --- generate.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generate.sh b/generate.sh index d7fb01b..bc86cd1 100755 --- a/generate.sh +++ b/generate.sh @@ -19,10 +19,10 @@ do cp template.html "$DEST"/"$filename".html # Replace -# sed -i "/{{title}}/c \\${headerline}1" "$DEST"/"$filename".html -# sed 's/{{title}}/'$headerline/ "$DEST"/"$filename".html - sed -i "s/{{title}}/${headerline}/" "$DEST"/"$filename".html - sed -i -e "s/{{body}}/${restofdoc}/g" "$DEST"/"$filename".html + /bin/sed -i "s/{{title}}/${headerline}/" "$DEST"/"$filename".html + /bin/sed -i -e "s|{{body}}|$restofdoc|g" "$DEST"/"$filename".html + /bin/sed -i -e "s|https[:]//[^ ]*.com|\0|g" "$DEST"/"$filename".html +# /bin/sed -i -e "s|(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?|url|g" "$DEST"/"$filename".html done #cat template.html