forked from mirrored-repos/manjaro-tools
tweak sets_dir
This commit is contained in:
parent
60c1912e44
commit
2f7c24904d
7 changed files with 33 additions and 51 deletions
|
@ -178,7 +178,6 @@ if [[ "$arch" == 'x86_64' ]]; then
|
|||
pacman_conf_arch='multilib'
|
||||
fi
|
||||
|
||||
sets_dir_iso="${sets_dir}/iso"
|
||||
cache_dir_lng="${cache_dir}/lng"
|
||||
cache_dir_xorg="${cache_dir}/xorg"
|
||||
cache_dir_iso="${cache_dir}/iso"
|
||||
|
|
|
@ -154,7 +154,6 @@ fi
|
|||
work_dir=${chroots_pkg}/${branch}/${arch}
|
||||
|
||||
cache_dir_pkg="${cache_dir}/${branch}/${arch}"
|
||||
sets_dir_pkg="${sets_dir}/pkg"
|
||||
|
||||
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
makepkg_conf="${PKGDATADIR}/makepkg-${arch}.conf"
|
||||
|
|
39
bin/mkset.in
39
bin/mkset.in
|
@ -16,36 +16,18 @@ SYSCONFDIR='@sysconfdir@'
|
|||
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
|
||||
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
|
||||
|
||||
create_set_pkg(){
|
||||
msg "[${sets_dir_pkg}/${name}.set]"
|
||||
if [[ -f ${sets_dir_pkg}/${name}.set ]];then
|
||||
msg3 "Backing up ${sets_dir_pkg}/${name}.set.orig"
|
||||
mv "${sets_dir_pkg}/${name}.set" "${sets_dir_pkg}/${name}.set.orig"
|
||||
fi
|
||||
local list=$(find * -maxdepth 0 -type d | sort)
|
||||
|
||||
for item in ${list[@]};do
|
||||
if [[ -f $item/PKGBUILD ]];then
|
||||
cd $item
|
||||
msg2 "Adding ${item##*/}"
|
||||
echo ${item##*/} >> ${sets_dir_pkg}/${name}.set || break
|
||||
cd ..
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
create_set_iso(){
|
||||
msg "[${sets_dir_iso}/${name}.set]"
|
||||
if [[ -f ${sets_dir_iso}/${name}.set ]];then
|
||||
msg3 "Backing up ${sets_dir_iso}/${name}.set.orig"
|
||||
mv "${sets_dir_iso}/${name}.set" "${sets_dir_iso}/${name}.set.orig"
|
||||
create_set(){
|
||||
msg "[$1/${name}.set]"
|
||||
if [[ -f $1/${name}.set ]];then
|
||||
msg3 "Backing up $1/${name}.set.orig"
|
||||
mv "$1/${name}.set" "$1/${name}.set.orig"
|
||||
fi
|
||||
local list=$(find * -maxdepth 0 -type d | sort)
|
||||
for item in ${list[@]};do
|
||||
if [[ -f $item/initsys ]];then
|
||||
if [[ -f $item/$2 ]];then
|
||||
cd $item
|
||||
msg2 "Adding ${item##*/}"
|
||||
echo ${item##*/} >> ${sets_dir_iso}/${name}.set || break
|
||||
echo ${item##*/} >> $1/${name}.set || break
|
||||
cd ..
|
||||
fi
|
||||
done
|
||||
|
@ -110,16 +92,13 @@ done
|
|||
|
||||
shift $(($OPTIND - 1))
|
||||
|
||||
sets_dir_pkg="${sets_dir}/pkg"
|
||||
sets_dir_iso="${sets_dir}/iso"
|
||||
|
||||
check_root "$0" "${orig_argv[@]}"
|
||||
|
||||
if ${create};then
|
||||
if ${iso_mode}; then
|
||||
create_set_iso
|
||||
create_set "${sets_dir_iso}" "initsys"
|
||||
else
|
||||
create_set_pkg
|
||||
create_set "${sets_dir_pkg}" "PKGBUILD"
|
||||
fi
|
||||
elif ${remove};then
|
||||
if ${iso_mode}; then
|
||||
|
|
|
@ -11,9 +11,6 @@
|
|||
# cache dir where buildpkg or buildiso cache packages
|
||||
# cache_dir=/var/cache/manjaro-tools
|
||||
|
||||
# custom path to sets
|
||||
# sets_dir=/etc/manjaro-tools/sets
|
||||
|
||||
##########################################
|
||||
################ buildpkg ################
|
||||
##########################################
|
||||
|
@ -21,6 +18,9 @@
|
|||
# default chroot path
|
||||
# chroots_pkg=/opt/buildpkg
|
||||
|
||||
# custom path to pkg sets
|
||||
# sets_dir_pkg=/etc/manjaro-tools/sets/pkg
|
||||
|
||||
# default pkg buildset; name without .set extension
|
||||
# buildset_pkg=default
|
||||
|
||||
|
@ -44,6 +44,9 @@
|
|||
# default work dir where the image chroots are located
|
||||
# chroots_iso=/opt/buildiso
|
||||
|
||||
# custom path to iso sets
|
||||
# sets_dir_iso=/etc/manjaro-tools/sets/iso
|
||||
|
||||
# default iso buildset; name without .set extension
|
||||
# buildset_iso=default
|
||||
|
||||
|
|
|
@ -912,7 +912,8 @@ load_pkgs_livecd(){
|
|||
fi
|
||||
}
|
||||
|
||||
load_desktop_definition(){
|
||||
load_profile(){
|
||||
|
||||
if [ -e Packages-Xfce ] ; then
|
||||
pkgsfile="Packages-Xfce"
|
||||
fi
|
||||
|
@ -957,11 +958,6 @@ load_desktop_definition(){
|
|||
fi
|
||||
desktop=${pkgsfile#*-}
|
||||
desktop=${desktop,,}
|
||||
}
|
||||
|
||||
load_profile(){
|
||||
|
||||
load_desktop_definition
|
||||
|
||||
displaymanager=$(cat displaymanager)
|
||||
initsys=$(cat initsys)
|
||||
|
@ -1041,7 +1037,7 @@ set_work_dir(){
|
|||
|
||||
build_iso(){
|
||||
if ${is_buildset};then
|
||||
msg "Start building [${buildset_iso}]"
|
||||
msg3 "Start building [${buildset_iso}]"
|
||||
for prof in $(cat ${sets_dir_iso}/${buildset_iso}.set); do
|
||||
[[ -f $prof/initsys ]] || break
|
||||
cd $prof
|
||||
|
@ -1050,7 +1046,7 @@ build_iso(){
|
|||
build_profile
|
||||
cd ..
|
||||
done
|
||||
msg "Finished building [${buildset_iso}]"
|
||||
msg3 "Finished building [${buildset_iso}]"
|
||||
else
|
||||
[[ -f ${buildset_iso}/initsys ]] || die "${buildset_iso} is not a valid profile!"
|
||||
cd ${buildset_iso}
|
||||
|
|
|
@ -85,7 +85,7 @@ move_pkg(){
|
|||
|
||||
chroot_build(){
|
||||
if ${is_buildset};then
|
||||
msg "Start building [${buildset_pkg}]"
|
||||
msg3 "Start building [${buildset_pkg}]"
|
||||
for pkg in $(cat ${sets_dir_pkg}/${buildset_pkg}.set); do
|
||||
[[ -f $pkg/PKGBUILD ]] || break
|
||||
cd $pkg
|
||||
|
@ -97,7 +97,7 @@ chroot_build(){
|
|||
move_pkg
|
||||
cd ..
|
||||
done
|
||||
msg "Finished building [${buildset_pkg}]"
|
||||
msg3 "Finished building [${buildset_pkg}]"
|
||||
else
|
||||
[[ -f ${buildset_pkg}/PKGBUILD ]] || die "${buildset_pkg} is not a valid profile!"
|
||||
cd ${buildset_pkg}
|
||||
|
|
18
lib/util.sh
18
lib/util.sh
|
@ -191,12 +191,6 @@ load_config(){
|
|||
cache_dir='/var/cache/manjaro-tools'
|
||||
fi
|
||||
|
||||
if [[ -n ${sets_dir} ]];then
|
||||
sets_dir=${sets_dir}
|
||||
else
|
||||
sets_dir="${SYSCONFDIR}/sets"
|
||||
fi
|
||||
|
||||
###################
|
||||
# buildpkg
|
||||
###################
|
||||
|
@ -206,6 +200,12 @@ load_config(){
|
|||
else
|
||||
chroots_pkg='/opt/buildpkg'
|
||||
fi
|
||||
|
||||
if [[ -n ${sets_dir_pkg} ]];then
|
||||
sets_dir_pkg=${sets_dir_pkg}
|
||||
else
|
||||
sets_dir_pkg="${SYSCONFDIR}/sets/pkg"
|
||||
fi
|
||||
|
||||
if [[ -n ${buildset_pkg} ]];then
|
||||
buildset_pkg=${buildset_pkg}
|
||||
|
@ -240,6 +240,12 @@ load_config(){
|
|||
else
|
||||
chroots_iso='/opt/buildiso'
|
||||
fi
|
||||
|
||||
if [[ -n ${sets_dir_iso} ]];then
|
||||
sets_dir_iso=${sets_dir_iso}
|
||||
else
|
||||
sets_dir_iso="${SYSCONFDIR}/sets/iso"
|
||||
fi
|
||||
|
||||
if [[ -n ${buildset_iso} ]];then
|
||||
buildset_iso=${buildset_iso}
|
||||
|
|
Loading…
Reference in a new issue