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

[lib] minor updates; cleaning

Browse source
This commit is contained in:
udeved 2015-06-09 00:02:32 +02:00
parent 5df5357812
commit b2787f9f14
4 changed files with 29 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/util-iso.sh
View file

@ -9,9 +9,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
[[ -r ${LIBDIR}/util-iso-image.sh ]] && source ${LIBDIR}/util-iso-image.sh
[[ -r ${LIBDIR}/util-iso-boot.sh ]] && source ${LIBDIR}/util-iso-boot.sh
[[ -r ${LIBDIR}/util-iso-calamares.sh ]] && source ${LIBDIR}/util-iso-calamares.sh
import ${LIBDIR}/util-iso-image.sh
import ${LIBDIR}/util-iso-boot.sh
import ${LIBDIR}/util-iso-calamares.sh
# check_run_dir(){
# if [[ ! -f shared/Packages-Systemd ]] || [[ ! -f shared/Packages-Openrc ]];then
@ -573,11 +573,11 @@ make_profile(){
build_iso(){
if ${is_buildset};then
for prof in $(cat ${sets_dir_iso}/${buildset_iso}.set); do
check_profile "$prof" "break"
# check_profile "$prof" "break"
make_profile "$prof"
done
else
check_profile "${buildset_iso}" 'die "Profile sanity check failed."'
# check_profile "${buildset_iso}" 'die "Profile sanity check failed."'
make_profile "${buildset_iso}"
fi
}

4
lib/util-msg.sh
View file

@ -11,6 +11,10 @@
export LC_MESSAGES=C
export LANG=C
import(){
[[ -r $1 ]] && source $1
}
# check if messages are to be printed using color
unset ALL_OFF BOLD BLUE GREEN RED YELLOW CYAN MAGENTA WHITE
if [[ -t 2 ]]; then

4
lib/util-pkg.sh
View file

@ -138,11 +138,11 @@ make_pkg(){
chroot_build(){
if ${is_buildset};then
for pkg in $(cat ${sets_dir_pkg}/${buildset_pkg}.set); do
check_sanity "$pkg/PKGBUILD" "break"
#check_sanity "$pkg/PKGBUILD" "break"
make_pkg "$pkg" "break"
done
else
check_sanity "${buildset_pkg}/PKGBUILD" 'die "Not a valid package!"'
#check_sanity "${buildset_pkg}/PKGBUILD" 'die "Not a valid package!"'
make_pkg "${buildset_pkg}" "abort"
fi
}

69
lib/util.sh
View file

@ -8,10 +8,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
import(){
[[ -r $1 ]] && source $1
}
create_set(){
msg "[$1/${name}.set]"
if [[ -f $1/${name}.set ]];then
@ -30,48 +26,15 @@ create_set(){
}
calculate_build_order(){
local is_split=false path=/tmp/calc
mkdir -p $path
#[[ -f $path/*.{sort,set,makedeps,split} ]] &&
rm $path/*
pacman -Qqg base-devel > $path/base-devel.set
for pkg in $(cat $1/${name}.set);do
cd $pkg
source PKGBUILD
if [[ -n $pkgbase ]];then
is_split=true; echo "$pkgbase" >> $path/${name}.split
fi
for m in ${makedepends[@]};do
echo $m >> $path/${name}.makedeps
done
cd ..
done
[[ -f $path/${name}.split ]] && sort -u $path/${name}.split > $path/${name}.split.sort
sort -u $path/${name}.makedeps > $path/${name}.makedeps.sort
[[ -f $path/${name}.split ]] && rm $path/${name}.split
for d in $(cat $path/${name}.makedeps.sort);do
for pkg in $(cat $1/${name}.set);do
if [[ $pkg == $d ]];then
echo $d >> $path/${name}.makedeps
fi
done
done
sort -u $path/${name}.makedeps > $path/${name}.makedeps.sort
rm $path/${name}.makedeps
sort -u $path/${name}.makedeps.sort $path/base-devel.set > $path/filter.set
for b in $(cat $path/base-devel.set);do
for m in $(cat $path/filter.set);do
if [[ $b == $m ]];then
sed "/$m/d" -i $path/filter.set
fi
done
done
local is_split=false path=/tmp/calc
mkdir -p $path
rm $path/*
msg3 "Calculating build order ..."
for pkg in $(cat $1/${name}.set);do
cd $pkg
mksrcinfio
cd ..
done
}
remove_set(){
@ -345,6 +308,10 @@ init_common(){
}
init_buildtree(){
tree_dir=${cache_dir}/pkgtree
tree_dir_abs=${tree_dir}/packages-archlinux
[[ -z ${repo_tree[@]} ]] && repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
[[ -z ${host_tree} ]] && host_tree='https://github.com/manjaro'
@ -553,11 +520,11 @@ check_profile(){
# $1: file
# $2: exit code
check_sanity(){
if [[ ! -f $1 ]]; then
eval "$2"
fi
}
# check_sanity(){
# if [[ ! -f $1 ]]; then
# eval "$2"
# fi
# }
show_version(){
msg "manjaro-tools"