GeorgeSG/sarah
1
0
Fork 0
mirror of https://github.com/GeorgeSG/sarah.git synced 2026-04-29 06:48:16 +00:00
Code Issues Projects Releases Wiki Activity

Better log formatting

Browse Source
This commit is contained in:
Georgi Gardev
2020-05-03 20:47:16 +03:00
parent d389d21343
commit 85ebbe30d5
6 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/logs
View File

@@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
set -o allexport; source "$(dirname $0)/.env"; set +o allexport set -o allexport; source "$(dirname $0)/.env"; set +o allexport
ssh $REMOTE_HOST -p $REMOTE_PORT -t \ ssh $REMOTE_HOST -p $REMOTE_PORT -t \

6
bin/restart
View File

@@ -1,7 +1,11 @@
#!/bin/bash #!/bin/bash
set -o allexport; source "$(dirname $0)/.env"; set +o allexport set -o allexport; source "$(dirname $0)/.env"; set +o allexport
source "$(dirname $0)/utils.sh"
log "[restart] Restarting Home Assistant..."
echo "Restarting..."
ssh $REMOTE_HOST -p $REMOTE_PORT \ ssh $REMOTE_HOST -p $REMOTE_PORT \
"docker-compose -f $REMOTE_REPO_PATH/docker/docker-compose.yml restart" "docker-compose -f $REMOTE_REPO_PATH/docker/docker-compose.yml restart"
log "[restart] ${GREEN}done${NO_FORMAT}"

7
bin/ui
View File

@@ -1,11 +1,14 @@
#!/bin/bash #!/bin/bash
set -o allexport; source "$(dirname $0)/.env"; set +o allexport set -o allexport; source "$(dirname $0)/.env"; set +o allexport
source "$(dirname $0)/utils.sh"
echo "Uploading UI configuration..." log "[ui] uploading configuration..."
ssh $REMOTE_HOST -p $REMOTE_PORT "rm -rf $REMOTE_REPO_PATH/config/lovelace" ssh $REMOTE_HOST -p $REMOTE_PORT "rm -rf $REMOTE_REPO_PATH/config/lovelace"
scp -P $REMOTE_PORT \ scp -P $REMOTE_PORT \
-r config/themes/ config/*-lovelace.yaml config/lovelace \ -r config/themes/ config/*-lovelace.yaml config/lovelace \
"${REMOTE_HOST}:${REMOTE_REPO_PATH}/config" "${REMOTE_HOST}:${REMOTE_REPO_PATH}/config" > /dev/null
log "${NO_FORMAT}[ui] ${GREEN}done${NO_FORMAT}"

5
bin/update
View File

@@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
/bin/bash "$(dirname $0)/upload"
sh "$(dirname $0)/upload"
echo echo
sh "$(dirname $0)/restart" /bin/bash "$(dirname $0)/restart"

10
bin/upload
View File

@@ -1,15 +1,19 @@
#!/bin/bash #!/bin/bash
set -o allexport; source "$(dirname $0)/.env"; set +o allexport set -o allexport; source "$(dirname $0)/.env"; set +o allexport
source "$(dirname $0)/utils.sh"
echo "Deleting old folders..." log "[upload] deleting old folders..."
ssh $REMOTE_HOST -p $REMOTE_PORT \ ssh $REMOTE_HOST -p $REMOTE_PORT \
"rm -rf $REMOTE_REPO_PATH/config/{custom_scripts,lovelace,packages,templates}" "rm -rf $REMOTE_REPO_PATH/config/{custom_scripts,lovelace,packages,templates}"
echo "Delete completed!" log "[upload] ${GREEN}delete done${NO_FORMAT}"
echo echo
log "[upload] reuploading..."
scp -P $REMOTE_PORT \ scp -P $REMOTE_PORT \
-r config/{custom_scripts,lovelace,packages,templates,themes,*.yaml} \ -r config/{custom_scripts,lovelace,packages,templates,themes,*.yaml} \
"${REMOTE_HOST}:${REMOTE_REPO_PATH}/config" "${REMOTE_HOST}:${REMOTE_REPO_PATH}/config" > /dev/null
log "[upload] ${GREEN}reupload done${NO_FORMAT}"

21
bin/utils.sh Normal file
View File

@@ -0,0 +1,21 @@
NO_COLOR='\033[0m'
RED='\033[0;31m'
GREEN='\033[0;32m'
ORANGE='\033[0;33m'
BLUE='\033[0;34m'
PURPLE='\033[0;35m'
CYAN='\033[0;36m'
LIGHTGRAY='\033[0;37m'
DARKGRAY='\033[1;30m'
LIGHTRED='\033[1;31m'
LIGHTGREEN='\033[1;32m'
YELLOW='\033[1;33m'
LIGHTBLUE='\033[1;34m'
LIGHTPURPLE='\033[1;35m'
LIGHTCYAN='\033[1;36m'
WHITE='\033[1;37m'
log() {
now=$(date +"%T")
echo -e "[$now] $1 $NO_COLOR"
}