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

[bin] use import function

Browse source
This commit is contained in:
udeved 2015-06-09 00:01:31 +02:00
parent f0aa9e4ebf
commit 5df5357812
13 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/basestrap.in
View file

@ -13,10 +13,12 @@ version=@version@
shopt -s extglob
PKGDATADIR='@pkgdatadir@'
LIBDIR='@libdir@'
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-mount.sh
newroot=/mnt

5
bin/buildiso.in
View file

@ -17,8 +17,9 @@ PKGDATADIR='@pkgdatadir@'
SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
[[ -r ${LIBDIR}/util-iso.sh ]] && source ${LIBDIR}/util-iso.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-iso.sh
show_profile(){
cd $1

5
bin/buildpkg.in
View file

@ -18,8 +18,9 @@ PKGDATADIR='@pkgdatadir@'
SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
[[ -r ${LIBDIR}/util-pkg.sh ]] && source ${LIBDIR}/util-pkg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-pkg.sh
show_build_queue(){
if ${is_buildset};then

5
bin/buildset.in
View file

@ -12,9 +12,10 @@
version=@version@
SYSCONFDIR='@sysconfdir@'
LIBDIR='@libdir@'
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
load_user_info

7
bin/buildtree.in
View file

@ -15,8 +15,8 @@ LIBDIR='@libdir@'
SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
[[ -r ${LIBDIR}/util-pkgtree.sh ]] && source ${LIBDIR}/util-pkgtree.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-pkgtree.sh
display_settings(){
show_version
@ -73,9 +73,6 @@ done
shift $(($OPTIND - 1))
tree_dir=${cache_dir}/buildtree
tree_dir_abs=${tree_dir}/packages-archlinux
check_root "$0" "${orig_argv[@]}"
prepare_dir "${tree_dir_abs}"

7
bin/checkpkg.in
View file

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

9
bin/chroot-run.in
View file

@ -11,9 +11,12 @@
version=@version@
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
[[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-mount.sh
working_dir=''
keep_mirrors=false

7
bin/find-libdeps.in
View file

@ -11,8 +11,11 @@
version=@version@
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
set -e
shopt -s extglob

7
bin/fstabgen.in
View file

@ -13,8 +13,11 @@ version=@version@
shopt -s extglob
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util-fstab.sh ]] && source @libdir@/util-fstab.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util-fstab.sh
write_source() {
local src=$1 spec= label= uuid= comment=()

7
bin/manjaro-chroot.in
View file

@ -13,8 +13,11 @@ version=@version@
shopt -s extglob
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util-mount.sh
usage() {
cat <<EOF

7
bin/mkchroot.in
View file

@ -11,8 +11,11 @@
version=@version@
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
working_dir=''
build_locales=false

7
bin/mkchrootpkg.in
View file

@ -11,8 +11,11 @@
version=@version@
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
shopt -s nullglob

7
bin/signpkg.in
View file

@ -11,8 +11,11 @@
version=@version@
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
load_vars "$HOME/.makepkg.conf"
load_vars /etc/makepkg.conf