root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

use environment msg path

Browse source
This commit is contained in:
udeved 2017-06-11 16:12:30 +02:00
parent 0e6882ad5e
commit bc00b792dd
18 changed files with 16 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -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

2
bin/basestrap.in
View file

@ -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

2
bin/buildiso.in
View file

@ -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

2
bin/buildpkg.in
View file

@ -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

2
bin/buildtree.in
View file

@ -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

2
bin/check-yaml.in
View file

@ -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

2
bin/checkpkg.in
View file

@ -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

2
bin/chroot-run.in
View file

@ -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

2
bin/deployiso.in
View file

@ -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

2
bin/find-libdeps.in
View file

@ -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

2
bin/finddeps.in
View file

@ -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

2
bin/fstabgen.in
View file

@ -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

2
bin/lddd.in
View file

@ -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}:"

2
bin/manjaro-chroot.in
View file

@ -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

2
bin/mkchroot.in
View file

@ -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

2
bin/mkchrootpkg.in
View file

@ -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

2
bin/signfile.in
View file

@ -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

124
lib/util-msg.sh
View file

@ -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
}