From a34137e43df275f7ea7c1c9523321abe967d816d Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Tue, 25 Mar 2014 12:46:07 +0530 Subject: [PATCH] Better way to moinitor git status and fixed issue #157 --- usr/local/sbin/easyengine | 23 ++++++++++++----------- usr/local/sbin/eeupdate | 3 +-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine index 9499a06f..9ded4f1c 100644 --- a/usr/local/sbin/easyengine +++ b/usr/local/sbin/easyengine @@ -651,8 +651,7 @@ EEGITINIT() fi # Check For Untracked Files - git status | grep clean &>> $INSTALLLOG - if [ $? -ne 0 ] + if [ $(git status -s | wc -l) -ne 0 ] then # Add Files In Git Version Control git add --all && git commit -am "Initialize Git On $EEGITDIR" &>> $INSTALLLOG \ @@ -663,9 +662,8 @@ EEGITINIT() EEGITCOMMIT() { cd $EEGITDIR || OwnError "Unable To Change Directory $EEGITDIR" - git status | grep clean &>> $INSTALLLOG - if [ $? -ne 0 ] + if [ $(git status -s | wc -l) -ne 0 ] then # Git Commit Functionality echo -e "\033[34mTake $EEGITDIR Configuration In Git Version Control...\e[0m" @@ -2438,13 +2436,16 @@ then # Edit The Nginx Configuration For $DOMAIN EESITEEDIT - # Reload Nginx Configuration - NGINXRELOAD - - # Take Nginx Configuration In Git Version Control - EEGITDIR=/etc/nginx - EEGITMESSAGE="Edited Website: $DOMAIN" - EEGITCOMMIT + if [ $(git status -s /etc/nginx/sites-available/$DOMAIN | wc -l) -ne 0 ] + then + # Take Nginx Configuration In Git Version Control + EEGITDIR=/etc/nginx + EEGITMESSAGE="Edited Website: $DOMAIN" + EEGITCOMMIT + + # Reload Nginx Configuration + NGINXRELOAD + fi else diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate index 3efba9a3..6e171a3d 100644 --- a/usr/local/sbin/eeupdate +++ b/usr/local/sbin/eeupdate @@ -25,8 +25,7 @@ GITCOMMIT () fi # Check For Untracked Files - git status | grep clean &>> $INSTALLLOG - if [ $? -ne 0 ] + if [ $(git status -s | wc -l) -ne 0 ] then # Add Files In Git Version Control git add --all && git commit -am "$EEGITMESSAGE" &>> $INSTALLLOG \