From 88d66d5689a02fa28dbcd5665978e6a3eae05ce4 Mon Sep 17 00:00:00 2001
From: Sid Xiong <xiongsiyadong@gmail.com>
Date: Wed, 21 Sep 2016 17:03:25 -0400
Subject: [PATCH 1/2] submit hw

---
 .gitignore  |  1 +
 generate.sh | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/.gitignore b/.gitignore
index b832777..e84ddba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ __pycache__/
 .cache/
 output/
 report.json
+.DS_Store
diff --git a/generate.sh b/generate.sh
index 51652b1..b066247 100755
--- a/generate.sh
+++ b/generate.sh
@@ -3,3 +3,42 @@
 set -ex
 
 # YOUR CODE HERE
+SRC_DIR=$1
+DES_DIR=$2
+
+if [ ! -x $DES_DIR ];then
+    mkdir -p $DES_DIR
+fi
+
+for f in `ls $SRC_DIR`
+do
+    if [ -f $SRC_DIR/$f ];then
+        line_count=`cat $SRC_DIR/$f |wc -l`
+
+        title=`head -1 $SRC_DIR/$f`
+        lines=`tail -n 1 $SRC_DIR/$f | tr "\n" "\r"`
+        # if [ $line_count -ne 2 ]; then
+        #     lines=`tail -$(($line_count - 2)) $SRC_DIR/$f | tr "\n" "\r"`
+        # else
+        #     lines=""
+        # fi
+
+        # tmplt=`cat ./template.html | sed "s/{{title}}/$title/"`
+        # echo $tmplt
+
+        # for line in `tail -$(($line_count - 2)) $SRC_DIR/$f`; do
+        #     echo "==="
+        #     echo $tmplt
+        #     tmplt=`echo -e $tmplt | sed "s/{{body}}/$line\n{{body}}/"`
+        #     echo $tmplt
+        # done
+
+        # echo "***"
+        # echo $tmplt
+
+        # echo -e $tmplt | sed "s/{{body}}/""/"  > $DES_DIR/$f.html
+
+        cat ./template.html | sed "s/{{title}}/$title/; s/{{body}}/$lines/" | tr "\r" "\n" > $DES_DIR/${f%.*}.html
+    fi
+done
+

From a02eb5d340da73fd892eea5bce6c6697839685a6 Mon Sep 17 00:00:00 2001
From: Sid Xiong <xiongsiyadong@gmail.com>
Date: Wed, 21 Sep 2016 17:18:58 -0400
Subject: [PATCH 2/2] submit hw & fix shellcheck issues

---
 generate.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/generate.sh b/generate.sh
index b066247..9b0ab93 100755
--- a/generate.sh
+++ b/generate.sh
@@ -6,17 +6,17 @@ set -ex
 SRC_DIR=$1
 DES_DIR=$2
 
-if [ ! -x $DES_DIR ];then
-    mkdir -p $DES_DIR
+if [ ! -x "$DES_DIR" ];then
+    mkdir -p "$DES_DIR"
 fi
 
-for f in `ls $SRC_DIR`
+for f in "$SRC_DIR"/*
 do
-    if [ -f $SRC_DIR/$f ];then
-        line_count=`cat $SRC_DIR/$f |wc -l`
+    if [ -f "$f" ];then
+        # line_count=$(cat $SRC_DIR/$f |wc -l)
 
-        title=`head -1 $SRC_DIR/$f`
-        lines=`tail -n 1 $SRC_DIR/$f | tr "\n" "\r"`
+        title=$(head -1 "$f")
+        lines=$(tail -n 1 "$f" | tr "\n" "\r")
         # if [ $line_count -ne 2 ]; then
         #     lines=`tail -$(($line_count - 2)) $SRC_DIR/$f | tr "\n" "\r"`
         # else
@@ -38,7 +38,9 @@ do
 
         # echo -e $tmplt | sed "s/{{body}}/""/"  > $DES_DIR/$f.html
 
-        cat ./template.html | sed "s/{{title}}/$title/; s/{{body}}/$lines/" | tr "\r" "\n" > $DES_DIR/${f%.*}.html
+        DEST_FILE=$(basename "$f")
+        # cat ./template.html | sed "s/{{title}}/$title/; s/{{body}}/$lines/" < ./template.html | tr "\r" "\n" > "$DES_DIR"/"${DEST_FILE%.*}".html
+        sed "s/{{title}}/$title/; s/{{body}}/$lines/" < ./template.html | tr "\r" "\n" > "$DES_DIR"/"${DEST_FILE%.*}".html
     fi
 done