Update run.sh
This commit is contained in:
26
run.sh
26
run.sh
@@ -9,12 +9,13 @@ else
|
|||||||
fi
|
fi
|
||||||
source /opt/idssys/defaults/colors.inc
|
source /opt/idssys/defaults/colors.inc
|
||||||
|
|
||||||
if [ "${1}" != "runup" ]; then
|
if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then
|
||||||
|
if [ "${1}" != "runup" ]; then
|
||||||
echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
|
echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${1}" != "runup" ]; then
|
if [ "${1}" != "runup" ]; then
|
||||||
cd /opt/idssys/defaults
|
cd /opt/idssys/defaults
|
||||||
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
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 fetch origin master >/dev/null 2>&1
|
||||||
@@ -24,13 +25,13 @@ if [ "${1}" != "runup" ]; then
|
|||||||
git prune >/dev/null 2>&1
|
git prune >/dev/null 2>&1
|
||||||
git pull >/dev/null 2>&1
|
git pull >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -d /opt/idssys/LinUPx ]; then
|
if [ -d /opt/idssys/LinUPx ]; then
|
||||||
cd /opt/idssys/LinUPx
|
cd /opt/idssys/LinUPx
|
||||||
else
|
else
|
||||||
cd /opt/idssys/linupx
|
cd /opt/idssys/linupx
|
||||||
fi
|
fi
|
||||||
if [ "$1" != "update" ] && [ "$1" != "up" ]; then
|
if [ "$1" != "update" ] && [ "$1" != "up" ]; then
|
||||||
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
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 fetch origin master >/dev/null 2>&1
|
||||||
git reset --hard origin/master >/dev/null 2>&1
|
git reset --hard origin/master >/dev/null 2>&1
|
||||||
@@ -39,11 +40,16 @@ if [ "$1" != "update" ] && [ "$1" != "up" ]; then
|
|||||||
git prune >/dev/null 2>&1
|
git prune >/dev/null 2>&1
|
||||||
git pull >/dev/null 2>&1
|
git pull >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ "${1}" != "runup" ]; then
|
if [ "${1}" != "runup" ]; then
|
||||||
echo -en "\e[1A";
|
echo -en "\e[1A";
|
||||||
echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
|
echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
|
||||||
echo ""
|
echo ""
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" != "runup" ]; then
|
||||||
/opt/idssys/linupx/linupx-scripts.sh $1 $2 $3 $4
|
/opt/idssys/linupx/linupx-scripts.sh $1 $2 $3 $4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Reference in New Issue
Block a user