Merge pull request #396 from neu5ron/master

update helk script tweak
neu5ron-patch-1
Nate Guagenti 2020-01-10 12:09:18 -05:00 committed by GitHub
commit aa1c6a91d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -343,10 +343,14 @@ check_github(){
if [[ -n $IS_MASTER_BEHIND ]]; then if [[ -n $IS_MASTER_BEHIND ]]; then
echo "Current master branch ahead of remote branch, possibly modified. Exiting..." >> $LOGFILE 2>&1 echo "Current master branch ahead of remote branch, possibly modified. Exiting..." >> $LOGFILE 2>&1
echo -e "${WAR}${HELK_WARNING_TAG}${STD} Current install has been modified." echo -e "${WAR}${HELK_WARNING_TAG}${STD} Current install has been modified."
echo -e "${WAR}${HELK_WARNING_TAG}${STD} Please commit your changes using git and then re-run this script."
exit 1
fi fi
if [[ $REBUILD_NEEDED == 0 ]] && [[ -z $IS_MASTER_BEHIND ]]; then if [[ $REBUILD_NEEDED == 0 ]] && [[ -z $IS_MASTER_BEHIND ]]; then
echo "Repository misconfigured. Exiting..." >> $LOGFILE 2>&1 echo "Repository misconfigured. Exiting..." >> $LOGFILE 2>&1
echo -e "${RED}${HELK_ERROR_TAG}${STD} Current repo is misconfigured." echo -e "${RED}${HELK_ERROR_TAG}${STD} Current repo is misconfigured."
echo -e "\nExiting script..."
exit 1
fi fi
else else