forked from mirrored-repos/manjaro-tools
mt: use xdg_config_home for mt.conf and makepkg.conf
This commit is contained in:
parent
ad13419fbe
commit
470e64b563
11 changed files with 25 additions and 23 deletions
|
@ -93,7 +93,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
# to force old way to have buildiso run in iso-profiles dir
|
||||
# run_dir=$(pwd)
|
||||
|
|
|
@ -69,8 +69,9 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_vars "$USER_HOME/.makepkg.conf" || load_vars /etc/makepkg.conf
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||
load_vars /etc/makepkg.conf
|
||||
|
||||
install_pkgs=()
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
sync=false
|
||||
pretend=false
|
||||
|
|
|
@ -83,7 +83,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
# to force old way to have buildiso run in iso-profiles dir
|
||||
# run_dir=$(pwd)
|
||||
|
|
|
@ -19,7 +19,7 @@ import ${LIBDIR}/util-pkg.sh
|
|||
|
||||
shopt -s extglob
|
||||
|
||||
load_vars "$HOME/.makepkg.conf"
|
||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||
load_vars /etc/makepkg.conf
|
||||
|
||||
if [[ ! -f PKGBUILD ]]; then
|
||||
|
|
|
@ -62,7 +62,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
run_dir=${cache_dir_iso}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${MT_USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
automount=false
|
||||
pretend=false
|
||||
|
|
|
@ -348,7 +348,7 @@ main() {
|
|||
|
||||
umask 0022
|
||||
|
||||
load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||
load_vars /etc/makepkg.conf
|
||||
|
||||
# Use PKGBUILD directory if these don't exist
|
||||
|
|
|
@ -17,7 +17,7 @@ LIBDIR='@libdir@'
|
|||
|
||||
import ${LIBDIR}/util.sh
|
||||
|
||||
load_vars "$HOME/.makepkg.conf"
|
||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||
load_vars /etc/makepkg.conf
|
||||
|
||||
if [ ! -e "$1" ]; then
|
||||
|
|
|
@ -20,8 +20,8 @@ prepare_initramfs(){
|
|||
cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
|
||||
local _kernver=$(cat $1/usr/lib/modules/*/version)
|
||||
if [[ -n ${gpgkey} ]]; then
|
||||
su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
|
||||
exec 17<>${USERCONFDIR}/gpgkey
|
||||
su ${OWNER} -c "gpg --export ${gpgkey} >${MT_USERCONFDIR}/gpgkey"
|
||||
exec 17<>${MT_USERCONFDIR}/gpgkey
|
||||
fi
|
||||
MISO_GNUPG_FD=${gpgkey:+17} chroot-run $1 \
|
||||
/usr/bin/mkinitcpio -k ${_kernver} \
|
||||
|
@ -31,8 +31,8 @@ prepare_initramfs(){
|
|||
if [[ -n ${gpgkey} ]]; then
|
||||
exec 17<&-
|
||||
fi
|
||||
if [[ -f ${USERCONFDIR}/gpgkey ]]; then
|
||||
rm ${USERCONFDIR}/gpgkey
|
||||
if [[ -f ${MT_USERCONFDIR}/gpgkey ]]; then
|
||||
rm ${MT_USERCONFDIR}/gpgkey
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
17
lib/util.sh
17
lib/util.sh
|
@ -205,7 +205,7 @@ init_buildpkg(){
|
|||
|
||||
make_conf_dir="${SYSCONFDIR}/make.conf.d"
|
||||
|
||||
[[ -d ${USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${USERCONFDIR}/pkg.list.d
|
||||
[[ -d ${MT_USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${MT_USERCONFDIR}/pkg.list.d
|
||||
|
||||
[[ -z ${build_list_pkg} ]] && build_list_pkg='default'
|
||||
|
||||
|
@ -261,7 +261,7 @@ init_buildiso(){
|
|||
|
||||
list_dir_iso="${SYSCONFDIR}/iso.list.d"
|
||||
|
||||
[[ -d ${USERCONFDIR}/iso.list.d ]] && list_dir_iso=${USERCONFDIR}/iso.list.d
|
||||
[[ -d ${MT_USERCONFDIR}/iso.list.d ]] && list_dir_iso=${MT_USERCONFDIR}/iso.list.d
|
||||
|
||||
[[ -z ${build_list_iso} ]] && build_list_iso='default'
|
||||
|
||||
|
@ -626,7 +626,7 @@ write_repo_conf(){
|
|||
for r in ${repos[@]}; do
|
||||
path=${r%/repo_info}
|
||||
name=${path##*/}
|
||||
echo "run_dir=$path" > ${USERCONFDIR}/$name.conf
|
||||
echo "run_dir=$path" > ${MT_USERCONFDIR}/$name.conf
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -639,13 +639,14 @@ load_user_info(){
|
|||
USER_HOME=$HOME
|
||||
fi
|
||||
|
||||
USERCONFDIR="$USER_HOME/.config/manjaro-tools"
|
||||
prepare_dir "${USERCONFDIR}"
|
||||
MT_USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/manjaro-tools"
|
||||
PAC_USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman"
|
||||
prepare_dir "${MT_USERCONFDIR}"
|
||||
}
|
||||
|
||||
load_run_dir(){
|
||||
[[ -f ${USERCONFDIR}/$1.conf ]] || write_repo_conf
|
||||
[[ -r ${USERCONFDIR}/$1.conf ]] && source ${USERCONFDIR}/$1.conf
|
||||
[[ -f ${MT_USERCONFDIR}/$1.conf ]] || write_repo_conf
|
||||
[[ -r ${MT_USERCONFDIR}/$1.conf ]] && source ${MT_USERCONFDIR}/$1.conf
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@ -655,7 +656,7 @@ show_version(){
|
|||
}
|
||||
|
||||
show_config(){
|
||||
if [[ -f ${USERCONFDIR}/manjaro-tools.conf ]]; then
|
||||
if [[ -f ${MT_USERCONFDIR}/manjaro-tools.conf ]]; then
|
||||
msg2 "config: %s" "~/.config/manjaro-tools/manjaro-tools.conf"
|
||||
else
|
||||
msg2 "config: %s" "${manjaro_tools_conf}"
|
||||
|
|
Loading…
Reference in a new issue