Update run.sh
This commit is contained in:
46
run.sh
46
run.sh
@@ -11,7 +11,7 @@ fi
|
|||||||
source /opt/idssys/nodemgmt/defaults.inc
|
source /opt/idssys/nodemgmt/defaults.inc
|
||||||
|
|
||||||
if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ]; then
|
if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ]; then
|
||||||
if [ -z $1 ] || $1 = "gui" ]; then
|
if [ -z $1 ] || "${1}" = "gui" ]; then
|
||||||
clear
|
clear
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -34,28 +34,30 @@ if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrene
|
|||||||
done
|
done
|
||||||
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
|
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
|
||||||
echo ""
|
echo ""
|
||||||
echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
|
if [ "${1}" != "gui" ]; then
|
||||||
echo ""
|
echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
|
||||||
cd /opt/idssys/defaults
|
echo ""
|
||||||
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
cd /opt/idssys/defaults
|
||||||
git fetch origin master >/dev/null 2>&1
|
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
||||||
git reset --hard origin/master >/dev/null 2>&1
|
git fetch origin master >/dev/null 2>&1
|
||||||
git reflog expire --expire=now --all >/dev/null 2>&1
|
git reset --hard origin/master >/dev/null 2>&1
|
||||||
git repack -ad >/dev/null 2>&1
|
git reflog expire --expire=now --all >/dev/null 2>&1
|
||||||
git prune >/dev/null 2>&1
|
git repack -ad >/dev/null 2>&1
|
||||||
git pull >/dev/null 2>&1
|
git prune >/dev/null 2>&1
|
||||||
|
git pull >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
cd /opt/idssys/nodemgmt
|
||||||
|
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
||||||
|
git fetch origin master >/dev/null 2>&1
|
||||||
|
git reset --hard origin/master >/dev/null 2>&1
|
||||||
|
git reflog expire --expire=now --all >/dev/null 2>&1
|
||||||
|
git repack -ad >/dev/null 2>&1
|
||||||
|
git prune >/dev/null 2>&1
|
||||||
|
git pull >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
echo -en "\e[1A";
|
||||||
|
echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
|
||||||
fi
|
fi
|
||||||
cd /opt/idssys/nodemgmt
|
|
||||||
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
|
||||||
git fetch origin master >/dev/null 2>&1
|
|
||||||
git reset --hard origin/master >/dev/null 2>&1
|
|
||||||
git reflog expire --expire=now --all >/dev/null 2>&1
|
|
||||||
git repack -ad >/dev/null 2>&1
|
|
||||||
git prune >/dev/null 2>&1
|
|
||||||
git pull >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
echo -en "\e[1A";
|
|
||||||
echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
|
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
/opt/idssys/nodemgmt/nodemgmt-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
|
/opt/idssys/nodemgmt/nodemgmt-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
|
||||||
|
|||||||
Reference in New Issue
Block a user