From 47297714e27ccb50038531c1aefa6b7bd20147e8 Mon Sep 17 00:00:00 2001 From: zeus Date: Tue, 23 Feb 2021 03:35:14 +0200 Subject: [PATCH] update --- restart.sh | 4 ++++ start.sh | 1 + update-agent.sh | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 restart.sh create mode 100755 update-agent.sh diff --git a/restart.sh b/restart.sh new file mode 100644 index 0000000..e1c7f7b --- /dev/null +++ b/restart.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +./stop.sh +./start.sh diff --git a/start.sh b/start.sh index 9695f1c..9cea158 100755 --- a/start.sh +++ b/start.sh @@ -1,5 +1,6 @@ wdir=$PWD +./update-agent.sh cd src-local ./start-server.sh cd $wdir diff --git a/update-agent.sh b/update-agent.sh new file mode 100755 index 0000000..07f7952 --- /dev/null +++ b/update-agent.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +git fetch + +UPSTREAM=${1:-'@{u}'} +LOCAL=$(git rev-parse @) +REMOTE=$(git rev-parse "$UPSTREAM") +BASE=$(git merge-base @ "$UPSTREAM") + +if [ $LOCAL = $REMOTE ]; then + echo "Up-to-date" +elif [ $LOCAL = $BASE ]; then + echo "Update swarmlab hybrid ..." + git pull origin +elif [ $REMOTE = $BASE ]; then + echo "Need to push" +else + echo "Diverged" +fi +