From 828771be36ebdb3c95bf659f4f7e1d4329065fc3 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Sep 2016 18:47:13 +0200
Subject: [PATCH] Update coloring
---
gitlab/functions.sh | 6 +++---
gitlab/install.sh | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index a29876d..b20e115 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -11,17 +11,17 @@ arch() {
# Functions for coloring echo commands
log_info() {
- echo -e "\033[1;32m(`date +%T`) ${@}\033[0m"
+ echo -e "(`date +%T`) \033[1;34m${@}\033[0m"
}
log_warn() {
- echo -e "\033[1;33m(`date +%T`) ${@}\033[0m"
+ echo -e "(`date +%T`) \033[1;35mWarning: ${@}\033[0m"
}
log_error() {
- echo -e "\033[1;31m(`date +%T`) ${@}\033[0m"
+ echo -e "(`date +%T`) \033[1;31mError: ${@}\033[0m"
}
diff --git a/gitlab/install.sh b/gitlab/install.sh
index 836ec69..157d57e 100755
--- a/gitlab/install.sh
+++ b/gitlab/install.sh
@@ -9,15 +9,18 @@ if [ "${#}" -ne 1 ]; then
exit 1
fi
+
# Functions for coloring echo commands
log_info() {
- echo -e "\033[1;32m(`date +%T`) ${@}\033[0m"
+ echo -e "(`date +%T`) \033[1;34m${@}\033[0m"
}
+
log_error() {
- echo -e "\033[1;31m(`date +%T`) ${@}\033[0m"
+ echo -e "(`date +%T`) \033[1;31mError: ${@}\033[0m"
}
+
# Function for running command and echoing results
run_cmd() {
log_info "$ ${@}"
@@ -31,15 +34,18 @@ run_cmd() {
fi
}
+
get_script() {
run_cmd curl --silent --output ${1}/${2} "https://gitlab.idiap.ch/bob/bob.admin/raw/master/gitlab/${2}"
}
+
get_exec() {
get_script ${1} ${2}
chmod 755 ${1}/${2}
}
+
run_cmd mkdir -pv ${1}
get_script ${1} functions.sh
for stage in "build" "test" "wheels" "deploy"; do
--
GitLab