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

restore to normal msg until bash package is done

Browse source
This commit is contained in:
udeved 2017-06-12 00:11:39 +02:00
parent 9f87dee9c0
commit 2ec2daaf59
17 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/basestrap.in
View file

@ -15,7 +15,7 @@ shopt -s extglob
DATADIR='@datadir@'
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-mount.sh
import ${LIBDIR}/util-chroot.sh

2
bin/buildiso.in
View file

@ -15,7 +15,7 @@ LIBDIR='@libdir@'
DATADIR='@datadir@'
SYSCONFDIR='@sysconfdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
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@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-chroot.sh
import ${LIBDIR}/util-pkg.sh

2
bin/buildtree.in
View file

@ -14,7 +14,7 @@ version=@version@
LIBDIR='@libdir@'
SYSCONFDIR='@sysconfdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
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@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-yaml-check.sh
import ${LIBDIR}/util-profile.sh

2
bin/checkpkg.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util-pkg.sh
shopt -s extglob

2
bin/chroot-run.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
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@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-publish.sh

2
bin/find-libdeps.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util-pkg.sh
set -e

2
bin/finddeps.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
match=$1
if [[ -z $match ]]; then

2
bin/fstabgen.in
View file

@ -15,7 +15,7 @@ shopt -s extglob
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util-fstab.sh
write_source() {

2
bin/lddd.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
ifs=$IFS
IFS="${IFS}:"

2
bin/manjaro-chroot.in
View file

@ -16,7 +16,7 @@ shopt -s extglob
LIBDIR='@libdir@'
SYSCONFDIR='@sysconfdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-mount.sh

2
bin/mkchroot.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-chroot.sh

2
bin/mkchrootpkg.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-chroot.sh

2
bin/signfile.in
View file

@ -13,7 +13,7 @@ version=@version@
LIBDIR='@libdir@'
import ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
load_user_info

14
lib/util-msg.sh
View file

@ -115,10 +115,10 @@ die() {
cleanup 255
}
# import(){
# if [[ -r "$1" ]];then
# source "$1"
# else
# die 'Could not import %s' "$1"
# fi
# }
import(){
if [[ -r "$1" ]];then
source "$1"
else
die 'Could not import %s' "$1"
fi
}