From 8ca09b14f24a5379d82bfe67c70aac955eb708f1 Mon Sep 17 00:00:00 2001 From: Bruno 21 Date: Mon, 16 Mar 2020 10:09:31 +0100 Subject: [PATCH] mkbuild.sh -plusieurs serveurs -fonction notification --- mkbuild.sh | 64 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/mkbuild.sh b/mkbuild.sh index e950c48..b3852a1 100755 --- a/mkbuild.sh +++ b/mkbuild.sh @@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/local/bin/bash if [ "$1" == "-h" ]; then echo -e "\\033[93mmkbuild.sh\\033[0m" - echo "Build MkDocs project and send him on server" + echo "Build MkDocs project and send him on servers" echo echo "USAGE: mkbuild" echo @@ -14,29 +14,53 @@ fi project_dir=/Users/bruno/project #exe=/usr/local/bin/ -user="bruno" -server="clicclac.synology.me" -destination="/volume1/web" -local_folder="central_docs" +# server1: clicclac.synology.me +declare -A server1 +server1[user]="bruno" +server1[server]="clicclac.synology.me" +server1[destination]="/volume1/web" +server1[local_folder]="central_docs" + +# server2: ovh.net +declare -A server2 +server2[user]="funnymac" +server2[server]="ftp.cluster011.ovh.net" +server2[destination]="/homez.528/funnymac/www" +server2[local_folder]="central_docs" + +notification() { + path_img=`dirname "$0"` + + if [ $3 -eq 0 ]; + then + sound="Glass" + message="Envoi terminé sur $2 !" + image="$path_img/success.png" + else + sound="Basso" + message="Echec lors de l'envoi sur $2 : erreur $result" + image="$path_img/error.png" + fi + + if [[ "$OSTYPE" == "linux-gnu" ]] && [ -x "$(command -v zenity)" ]; then + zenity --title="$1" --notification --text="$message" + elif [[ "$OSTYPE" == "darwin"* ]] && [ -x "$(command -v terminal-notifier)" ]; then + terminal-notifier -title "$1" -message "$message" -sound "$sound" -contentImage "$image" + fi + +} cd $project_dir || exit mkdocs build --clean -scp -P42666 -pr ./$local_folder $user@$server:$destination #rsync -avz --stats --progress /Users/bruno/project/central_docs/ $user@$server::$dest +scp -P42666 -pr ./${server1[local_folder]} ${server1[user]}@${server1[server]}:${server1[destination]} + result=$? +notification "MkDocs: sending Docs to ${server1[server]}..." "${server1[server]}" $result -titre="MkDocs" -if [ $result -eq 0 ]; then - sound="Glass" - message="Envoi terminé sur $server !" -else - sound="Basso" - message="Echec lors de l'envoi sur $server : erreur $result" -fi -if [[ "$OSTYPE" == "linux-gnu" ]] && [ -x "$(command -v zenity)" ]; then - zenity --title="$titre" --notification --text="$message" -elif [[ "$OSTYPE" == "darwin"* ]] && [ -x "$(command -v terminal-notifier)" ]; then - terminal-notifier -title "$titre" -message "$message" -sound $sound -fi +scp -pr ./${server2[local_folder]} ${server2[user]}@${server2[server]}:${server2[destination]} + +result=$? +notification "MkDocs: sending Docs to ${server2[server]}..." "${server2[server]}" $result