update
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
action="$1"
|
action="$1"
|
||||||
FOLDER='/opt/idssys/linupx'
|
FOLDER='/opt/idssys/linupx'
|
||||||
VERS='6.60.24-02102024'
|
VERS='6.60.25-02102024'
|
||||||
|
|
||||||
IPERFVER="3.15"
|
IPERFVER="3.15"
|
||||||
|
|
||||||
|
|||||||
43
run.sh
43
run.sh
@@ -23,7 +23,7 @@ if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP
|
|||||||
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
|
||||||
if [ "${1}" != "runup" ]; then
|
if [ "${1}" != "runup" ]; then
|
||||||
echo -en "\e[1A";
|
echo -en "\e[1A";
|
||||||
echo -e "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}"
|
echo -en "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}"
|
||||||
udtd=true
|
udtd=true
|
||||||
fi
|
fi
|
||||||
git fetch origin master >/dev/null 2>&1
|
git fetch origin master >/dev/null 2>&1
|
||||||
@@ -32,6 +32,7 @@ if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP
|
|||||||
git repack -ad >/dev/null 2>&1
|
git repack -ad >/dev/null 2>&1
|
||||||
git prune >/dev/null 2>&1
|
git prune >/dev/null 2>&1
|
||||||
git pull >/dev/null 2>&1
|
git pull >/dev/null 2>&1
|
||||||
|
[ "${1}" != "runup" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -40,33 +41,31 @@ if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP
|
|||||||
else
|
else
|
||||||
cd /opt/idssys/linupx
|
cd /opt/idssys/linupx
|
||||||
fi
|
fi
|
||||||
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
|
if [ "${1}" != "runup" ]; then
|
||||||
if [ "${1}" != "runup" ]; then
|
echo -en "${idsCL[LightCyan]}Updating LinUPx...${idsCL[Default]}"
|
||||||
echo -en "\e[1A";
|
udtd=true
|
||||||
echo -e "\e[0K\r ${idsCL[LightCyan]}Updating LinUPx...${idsCL[Default]}"
|
|
||||||
udtd=true
|
|
||||||
fi
|
|
||||||
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
|
|
||||||
|
|
||||||
if [ "${1}" != "runup" ]; then
|
|
||||||
source /opt/idssys/linupx/defaults.inc
|
|
||||||
echo -en "\e[1A";
|
|
||||||
echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
git fetch origin master >/dev/null 2>&1
|
||||||
if [ "${1}" != "runup" ] && [ "${udtd}" == "false" ]; then
|
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
|
||||||
|
|
||||||
|
if [ "${1}" != "runup" ]; then
|
||||||
|
source /opt/idssys/linupx/defaults.inc
|
||||||
|
# echo -en "\e[1A";
|
||||||
|
# echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
|
||||||
|
echo -e "${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
|
||||||
|
fi
|
||||||
|
elif [ "${1}" != "runup" ]; then
|
||||||
echo -en "\e[1A";
|
echo -en "\e[1A";
|
||||||
echo -e "\e[0K\r ${idsCL[Green]}No updates available${idsCL[Default]}"
|
echo -e "\e[0K\r ${idsCL[Green]}No updates available${idsCL[Default]}"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}"
|
echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user