From 4f406a96c89f2e641c4ea6f73a3801171d92a832 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 22 Dec 2021 13:18:41 +0100 Subject: [PATCH] Reformated files with unix coding --- uninstall-bridgehead.sh | 12 +++--- update-bridgehead.sh | 84 ++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 48 deletions(-) mode change 100644 => 100755 uninstall-bridgehead.sh mode change 100644 => 100755 update-bridgehead.sh diff --git a/uninstall-bridgehead.sh b/uninstall-bridgehead.sh old mode 100644 new mode 100755 index 628e8ed..6425f49 --- a/uninstall-bridgehead.sh +++ b/uninstall-bridgehead.sh @@ -1,6 +1,6 @@ -echo "Stoping systemd services and removing bridgehead" - -source site.conf - -systemctl stop bridgehead@"${project}".service -systemctl stop bridgehead-update@"${project}".timer +echo "Stoping systemd services and removing bridgehead" + +source site.conf + +systemctl stop bridgehead@"${project}".service +systemctl stop bridgehead-update@"${project}".timer diff --git a/update-bridgehead.sh b/update-bridgehead.sh old mode 100644 new mode 100755 index 3f6e7a7..11b1393 --- a/update-bridgehead.sh +++ b/update-bridgehead.sh @@ -1,42 +1,42 @@ -#!/bin/bash -service="bridgehead" -# Creates logs -log() { - echo "$(date +'%Y-%m-%d %T')" "$1:" "$2" -} - -log "INFO" "Checking for updates of $service" -# check prerequisites -prerequisites="git docker docker-compose" -for prerequisite in $prerequisites; do - $prerequisite --version 2>&1 - is_available=$? - if [ $is_available -gt 0 ]; then - log "ERROR" "Prerequisite not fulfilled - $prerequisite is not available!" - exit 79 - fi -done -# check if updates are available -old_git_hash="$(git rev-parse --verify HEAD)" -git fetch 2>&1 -git pull 2>&1 -new_git_hash="$(git rev-parse --verify HEAD)" -git_updated="false" -if [ "$old_git_hash" != "$new_git_hash" ]; then - log "INFO" "Pulled new changes from origin" - git_updated="true" -fi -docker_updated="false" -for image in $(docker ps --filter "name=$service" --format {{.Image}}); do - log "INFO" "Checking for Updates of Image: $image" - if docker pull $image | grep "Downloaded newer image"; then - log "INFO" "$image updated." - docker_updated="true" - fi -done -if [ $git_updated = "true" ] || [ $docker_updated = "true" ]; then - log "INFO" "Due to previous updates now restarting $service@$1" - systemctl restart "$service@$1.service" -fi -log "INFO" "checking updates finished" -exit 0 +#!/bin/bash +service="bridgehead" +# Creates logs +log() { + echo "$(date +'%Y-%m-%d %T')" "$1:" "$2" +} + +log "INFO" "Checking for updates of $service" +# check prerequisites +prerequisites="git docker docker-compose" +for prerequisite in $prerequisites; do + $prerequisite --version 2>&1 + is_available=$? + if [ $is_available -gt 0 ]; then + log "ERROR" "Prerequisite not fulfilled - $prerequisite is not available!" + exit 79 + fi +done +# check if updates are available +old_git_hash="$(git rev-parse --verify HEAD)" +git fetch 2>&1 +git pull 2>&1 +new_git_hash="$(git rev-parse --verify HEAD)" +git_updated="false" +if [ "$old_git_hash" != "$new_git_hash" ]; then + log "INFO" "Pulled new changes from origin" + git_updated="true" +fi +docker_updated="false" +for image in $(docker ps --filter "name=$service" --format {{.Image}}); do + log "INFO" "Checking for Updates of Image: $image" + if docker pull $image | grep "Downloaded newer image"; then + log "INFO" "$image updated." + docker_updated="true" + fi +done +if [ $git_updated = "true" ] || [ $docker_updated = "true" ]; then + log "INFO" "Due to previous updates now restarting $service@$1" + systemctl restart "$service@$1.service" +fi +log "INFO" "checking updates finished" +exit 0