diff --git a/Makefile b/Makefile index 6e9f65b..aa5f7ec 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,6 @@ BIN_BASE = \ LIBS_BASE = \ lib/util.sh \ lib/util-mount.sh \ - lib/util-msg.sh \ lib/util-chroot.sh \ lib/util-fstab.sh diff --git a/bin/basestrap.in b/bin/basestrap.in index f106a2b..85f3b31 100644 --- a/bin/basestrap.in +++ b/bin/basestrap.in @@ -15,7 +15,7 @@ shopt -s extglob DATADIR='@datadir@' LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/buildiso.in b/bin/buildiso.in index 6ac30f0..e944405 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -15,7 +15,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-iso.sh diff --git a/bin/buildpkg.in b/bin/buildpkg.in index 8df4a69..a02d41e 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -17,7 +17,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/buildtree.in b/bin/buildtree.in index 32363a3..b8edfc8 100644 --- a/bin/buildtree.in +++ b/bin/buildtree.in @@ -14,7 +14,7 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-pkg-tree.sh diff --git a/bin/check-yaml.in b/bin/check-yaml.in index 376c41d..afb7b00 100644 --- a/bin/check-yaml.in +++ b/bin/check-yaml.in @@ -15,7 +15,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-yaml-check.sh diff --git a/bin/checkpkg.in b/bin/checkpkg.in index b066728..6deb31c 100644 --- a/bin/checkpkg.in +++ b/bin/checkpkg.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util-pkg.sh diff --git a/bin/chroot-run.in b/bin/chroot-run.in index 958f21d..10be8b8 100644 --- a/bin/chroot-run.in +++ b/bin/chroot-run.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/deployiso.in b/bin/deployiso.in index 064b16d..34dc018 100644 --- a/bin/deployiso.in +++ b/bin/deployiso.in @@ -14,7 +14,7 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-publish.sh diff --git a/bin/find-libdeps.in b/bin/find-libdeps.in index 1f61d3b..c368217 100644 --- a/bin/find-libdeps.in +++ b/bin/find-libdeps.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util-pkg.sh diff --git a/bin/finddeps.in b/bin/finddeps.in index 4269479..2701f55 100644 --- a/bin/finddeps.in +++ b/bin/finddeps.in @@ -11,7 +11,7 @@ version=@version@ -[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} match=$1 diff --git a/bin/fstabgen.in b/bin/fstabgen.in index 9a779d8..e308352 100644 --- a/bin/fstabgen.in +++ b/bin/fstabgen.in @@ -15,7 +15,7 @@ shopt -s extglob LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util-fstab.sh diff --git a/bin/lddd.in b/bin/lddd.in index 6e0c5ac..7a9931d 100644 --- a/bin/lddd.in +++ b/bin/lddd.in @@ -11,7 +11,7 @@ version=@version@ -[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} ifs=$IFS IFS="${IFS}:" diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in index c716620..062cd24 100644 --- a/bin/manjaro-chroot.in +++ b/bin/manjaro-chroot.in @@ -16,7 +16,7 @@ shopt -s extglob LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/mkchroot.in b/bin/mkchroot.in index d1ea92a..8176d08 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in index cbcf2b3..ad1ad7c 100644 --- a/bin/mkchrootpkg.in +++ b/bin/mkchrootpkg.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/signfile.in b/bin/signfile.in index f11142d..c16459d 100644 --- a/bin/signfile.in +++ b/bin/signfile.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh +[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh diff --git a/lib/util-msg.sh b/lib/util-msg.sh deleted file mode 100644 index d4bd1b8..0000000 --- a/lib/util-msg.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -export LC_MESSAGES=C -export LANG=C - -declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW='' - -if [[ -t 2 ]]; then - # prefer terminal safe colored and bold text when tput is supported - if tput setaf 0 &>/dev/null; then - ALL_OFF="$(tput sgr0)" - BOLD="$(tput bold)" - RED="${BOLD}$(tput setaf 1)" - GREEN="${BOLD}$(tput setaf 2)" - YELLOW="${BOLD}$(tput setaf 3)" - BLUE="${BOLD}$(tput setaf 4)" - else - ALL_OFF="\e[0m" - BOLD="\e[1m" - RED="${BOLD}\e[31m" - GREEN="${BOLD}\e[32m" - YELLOW="${BOLD}\e[33m" - BLUE="${BOLD}\e[34m" - fi -fi -readonly ALL_OFF BOLD BLUE GREEN RED YELLOW - -plain() { - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -msg() { - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -msg2() { - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -info() { - local mesg=$1; shift - printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -warning() { - local mesg=$1; shift - printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -error() { - local mesg=$1; shift - printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -stat_busy() { - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2 -} - -stat_done() { - printf "${BOLD}done${ALL_OFF}\n" >&2 -} - -lock_close() { - local fd=$1 - exec {fd}>&- -} - -lock() { - if ! [[ "/dev/fd/$1" -ef "$2" ]]; then - mkdir -p -- "$(dirname -- "$2")" - eval "exec $1>"'"$2"' - fi - if ! flock -n $1; then - stat_busy "$3" - flock $1 - stat_done - fi -} - -slock() { - if ! [[ "/dev/fd/$1" -ef "$2" ]]; then - mkdir -p -- "$(dirname -- "$2")" - eval "exec $1>"'"$2"' - fi - if ! flock -sn $1; then - stat_busy "$3" - flock -s $1 - stat_done - fi -} - -cleanup() { - exit ${1:-0} -} - -abort() { - error 'Aborting...' - cleanup 255 -} - -die() { - (( $# )) && error "$@" - cleanup 255 -} - -import(){ - if [[ -r "$1" ]];then - source "$1" - else - die 'Could not import %s' "$1" - fi -}