Add functions library "logging"
This commit is contained in:
parent
2b99c115bb
commit
ba8db2a5bb
3 changed files with 17 additions and 17 deletions
10
build.sh
10
build.sh
|
@ -4,6 +4,7 @@ export IMG_DATE="$(date +%Y-%m-%d)"
|
|||
|
||||
export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
export SCRIPT_DIR="$BASE_DIR/scripts"
|
||||
export FUNCTIONS_DIR="$BASE_DIR/functions"
|
||||
export WORK_DIR="$BASE_DIR/work/$IMG_DATE-$IMG_NAME"
|
||||
export DEPLOY_DIR="$BASE_DIR/deploy"
|
||||
export LOG_FILE="$WORK_DIR/build.log"
|
||||
|
@ -28,17 +29,10 @@ export QUILT_NO_DIFF_INDEX=1
|
|||
export QUILT_NO_DIFF_TIMESTAMPS=1
|
||||
export QUILT_REFRESH_ARGS='-p ab'
|
||||
|
||||
source "$FUNCTIONS_DIR/logging.sh"
|
||||
source "$SCRIPT_DIR/common.sh"
|
||||
source "$SCRIPT_DIR/dependencies_check.sh"
|
||||
|
||||
log_begin() {
|
||||
log "Begin $1"
|
||||
}
|
||||
|
||||
log_end() {
|
||||
log "End $1"
|
||||
}
|
||||
|
||||
main() {
|
||||
dependencies_check "$BASE_DIR/depends"
|
||||
|
||||
|
|
15
functions/logging.sh
Executable file
15
functions/logging.sh
Executable file
|
@ -0,0 +1,15 @@
|
|||
log() {
|
||||
tput setaf 2 # Green color
|
||||
date +"[%T] $@"
|
||||
tput sgr0 # No color
|
||||
|
||||
date +"[%T] $@" >> "$LOG_FILE"
|
||||
}
|
||||
|
||||
log_begin() {
|
||||
log "Begin $1"
|
||||
}
|
||||
|
||||
log_end() {
|
||||
log "End $1"
|
||||
}
|
|
@ -1,12 +1,3 @@
|
|||
log() {
|
||||
tput setaf 2 # Green color
|
||||
date +"[%T] $@"
|
||||
tput sgr0 # No color
|
||||
|
||||
date +"[%T] $@" >> "$LOG_FILE"
|
||||
}
|
||||
export -f log
|
||||
|
||||
bootstrap() {
|
||||
local ARCH
|
||||
ARCH=$(dpkg --print-architecture)
|
||||
|
|
Reference in a new issue