From a76e41a5dcfba9bbdc52618423407fcda660a1fc Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Tue, 1 Oct 2019 03:38:36 +0800
Subject: [PATCH] Improved the assistant scripts.

---
 build.sh | 39 +++++++++++++++++++++------------------
 run.sh   | 13 ++++---------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/build.sh b/build.sh
index 8beb90a..adecf23 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,9 @@
 # Published under MIT License
 
 
+CMD="JEKYLL_ENV=production bundle exec jekyll b"
+DEST=$(realpath '_site')
+
 help() {
    echo "Usage:"
    echo
@@ -25,18 +28,14 @@ init() {
   fi
 
   if [[ -d _site ]]; then
-    rm -rf _site
+    jekyll clean
   fi
 
-  if [[ -d ../.chirpy-cache ]]; then
-    rm -rf ../.chirpy-cache
-  fi
+  temp=$(mktemp -d)
+  cp -r * $temp
+  cp -r .git $temp
+  mv $temp .container
 
-  mkdir ../.chirpy-cache
-  cp -r *   ../.chirpy-cache
-  cp -r .git ../.chirpy-cache
-
-  mv ../.chirpy-cache .container
 }
 
 
@@ -49,9 +48,6 @@ check_unset() {
 }
 
 
-CMD="JEKYLL_ENV=production bundle exec jekyll b"
-DEST=`realpath "./_site"`
-
 while [[ $# -gt 0 ]]
 do
   opt="$1"
@@ -72,10 +68,7 @@ do
       ;;
     -d|--destination)
       check_unset $2
-      if [[ -d $2 ]]; then
-        rm -rf $2
-      fi
-      DEST=$2
+      DEST=$(realpath $2)
       shift;
       shift;
       ;;
@@ -90,6 +83,7 @@ do
   esac
 done
 
+
 init
 
 cd .container
@@ -97,10 +91,19 @@ cd .container
 echo "$ cd $(pwd)"
 python _scripts/py/init_all.py
 
-CMD+=" -d $DEST"
+CMD+=" -d ${DEST}"
 echo "\$ $CMD"
 eval $CMD
+echo -e "\nBuild success, the site files placed in '${DEST}'."
 
-echo "$(date) - Build success, the Site files placed in _site."
+if [[ -d ${DEST}/.git ]]; then
+
+  if [[ ! -z $(git -C $DEST status -s) ]]; then
+    git -C $DEST add .
+    git -C $DEST commit -m "[Automation] Update site files." -q
+    echo -e "\nPlease push the changes of '$(realpath $DEST)' to remote master branch.\n"
+  fi
+
+fi
 
 cd .. && rm -rf .container
diff --git a/run.sh b/run.sh
index dc29dc9..7ad890f 100755
--- a/run.sh
+++ b/run.sh
@@ -32,15 +32,10 @@ init() {
     rm -rf .container
   fi
 
-  if [[ -d ../.chirpy-cache ]]; then
-    rm -rf ../.chirpy-cache
-  fi
-
-  mkdir ../.chirpy-cache
-  cp -r * ../.chirpy-cache
-  cp -r .git  ../.chirpy-cache
-
-  mv ../.chirpy-cache .container
+  temp=$(mktemp -d)
+  cp -r * $temp
+  cp -r .git $temp
+  mv $temp .container
 
   trap cleanup INT
 }