forked from mirrored-repos/manjaro-tools
[sets] allow user sets in $HOME/.config/manjaro-tools/sets/{pkg.d,iso.d}
This commit is contained in:
parent
4d23822e89
commit
886307ff49
3 changed files with 19 additions and 10 deletions
16
README.md
16
README.md
|
@ -33,6 +33,19 @@ By default it is commented and shows just initialization values done in code.
|
|||
Tools configuration is done in manjaro-tools.conf or by args.
|
||||
Specifying args will override manjaro-tools.conf settings.
|
||||
|
||||
User sets can be placed in
|
||||
|
||||
~~~
|
||||
$HOME/.config/manjaro-tools/sets/{pkg.d,iso.d}
|
||||
~~~
|
||||
|
||||
overriding
|
||||
|
||||
~~~
|
||||
/etc/manjaro-tools/sets/{pkg.d,iso.d}
|
||||
~~~
|
||||
|
||||
|
||||
~~~
|
||||
######################################################
|
||||
################ manjaro-tools.conf ##################
|
||||
|
@ -50,9 +63,6 @@ Specifying args will override manjaro-tools.conf settings.
|
|||
# build dir where buildpkg or buildiso chroots are created
|
||||
# chroots_dir=/var/lib/manjaro-tools
|
||||
|
||||
# default path to sets
|
||||
# sets_dir=/etc/manjaro-tools/sets
|
||||
|
||||
# custom build mirror server
|
||||
# build_mirror=http://mirror.netzspielplatz.de/manjaro/packages
|
||||
|
||||
|
|
|
@ -14,9 +14,6 @@
|
|||
# build dir where buildpkg or buildiso chroots are created
|
||||
# chroots_dir=/var/lib/manjaro-tools
|
||||
|
||||
# default path to sets
|
||||
# sets_dir=/etc/manjaro-tools/sets
|
||||
|
||||
# custom build mirror server
|
||||
# build_mirror=http://mirror.netzspielplatz.de/manjaro/packages
|
||||
|
||||
|
|
10
lib/util.sh
10
lib/util.sh
|
@ -122,8 +122,6 @@ init_common(){
|
|||
|
||||
[[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/manjaro-tools'
|
||||
|
||||
[[ -z ${sets_dir} ]] && sets_dir="${SYSCONFDIR}/sets"
|
||||
|
||||
[[ -z ${build_mirror} ]] && build_mirror='http://mirror.netzspielplatz.de/manjaro/packages'
|
||||
}
|
||||
|
||||
|
@ -142,10 +140,12 @@ init_buildtree(){
|
|||
init_buildpkg(){
|
||||
chroots_pkg="${chroots_dir}/buildpkg"
|
||||
|
||||
sets_dir_pkg="${sets_dir}/pkg.d"
|
||||
sets_dir_pkg="${SYSCONFDIR}/sets/pkg.d"
|
||||
|
||||
prepare_dir "${sets_dir_pkg}"
|
||||
|
||||
[[ -d $USER_CONFIG/sets/pkg.d ]] && sets_dir_pkg=$USER_CONFIG/sets/pkg.d
|
||||
|
||||
[[ -z ${buildset_pkg} ]] && buildset_pkg='default'
|
||||
|
||||
cache_dir_pkg=${cache_dir}/pkg
|
||||
|
@ -154,10 +154,12 @@ init_buildpkg(){
|
|||
init_buildiso(){
|
||||
chroots_iso="${chroots_dir}/buildiso"
|
||||
|
||||
sets_dir_iso="${sets_dir}/iso.d"
|
||||
sets_dir_iso="${SYSCONFDIR}/sets/iso.d"
|
||||
|
||||
prepare_dir "${sets_dir_iso}"
|
||||
|
||||
[[ -d $USER_CONFIG/sets/iso.d ]] && sets_dir_iso=$USER_CONFIG/sets/iso.d
|
||||
|
||||
[[ -z ${buildset_iso} ]] && buildset_iso='default'
|
||||
|
||||
cache_dir_iso="${cache_dir}/iso"
|
||||
|
|
Loading…
Reference in a new issue