attempting to add logging

1 files changed, 23 insertions, 7 deletions

diff --git a/simpleci.sh b/simpleci.sh
index 43aef34..5a09a8c 100755
--- a/simpleci.sh
+++ b/simpleci.sh
@@ -4,6 +4,7 @@ SCRIPT_DIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
 
 JOB_DIR="${SCRIPT_DIR}/jobs"
 WORKSPACE_DIR="${SCRIPT_DIR}/workspaces"
+LOG_DIR="${SCRIPT_DIR}/logs"
 
 check_for_remote_changes() {
     local DIR=$1
@@ -34,28 +35,43 @@ trigger() {
     REPO=""
     BRANCH="live"
     COMMAND="make publish"
+    WORKSPACE=""
     source "${1}"
-    DIR="$(echo ${REPO##*/} | sed -e 's/\.git$//')"
+    if [ ${WORKSPACE} ]; then
+	DIR="${WORKSPACE}"
+    else
+	DIR="$(echo ${REPO##*/} | sed -e 's/\.git$//')"
+    fi
     FORCE=${2}
+    TIMESTAMP=$(date +"%Y-%m-%d %H:%M:%S")
 
 #    echo REPO=${REPO}
 #    echo BRANCH=${BRANCH}
 #    echo COMMAND=${COMMAND}
 #    echo DIR=${DIR}
-#    echo FORCE=${FORCE}
+    #    echo FORCE=${FORCE}
+
+    pushd ${LOG_DIR} > /dev/null
+    git checkout -B ${DIR}
+    popd > /dev/null
 
     if [ ${REPO} ]; then
         if ! [ -e "${WORKSPACE_DIR}/${DIR}" ] ; then
-            git clone -b ${BRANCH} ${REPO} "${WORKSPACE_DIR}/${DIR}"
+            git clone -b ${BRANCH} ${REPO} "${WORKSPACE_DIR}/${DIR}" >> ${LOG_DIR}/build.log 2>&1
             FORCE=1
         fi
         if [ "${FORCE}" ] || check_for_remote_changes "${WORKSPACE_DIR}/${DIR}" "${BRANCH}"; then
-            pushd "${WORKSPACE_DIR}/${DIR}"
-            git pull origin ${BRANCH}  # Pull the latest changes
-            ${COMMAND}
-            popd
+            pushd "${WORKSPACE_DIR}/${DIR}" > /dev/null
+            git pull origin ${BRANCH}   >> ${LOG_DIR}/build.log 2>&1
+            ${COMMAND} >> ${LOG_DIR}/build.log 2>&1
+            popd > /dev/null
         fi
     fi
+    
+    pushd ${LOG_DIR} > /dev/null
+    git commit -am "Build ${TIMESTAMP}"
+    git push -u origin "${DIR}"
+    popd > /dev/null
 }
 
 mkdir -p "${WORKSPACE_DIR}"