From 470e64b56314bae5741e16b242d70507f3deb03d Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Wed, 19 Apr 2017 20:37:01 +0200
Subject: [PATCH] mt: use xdg_config_home for mt.conf and makepkg.conf

---
 bin/buildiso.in       |  2 +-
 bin/buildpkg.in       |  5 +++--
 bin/buildtree.in      |  2 +-
 bin/check-yaml.in     |  2 +-
 bin/checkpkg.in       |  2 +-
 bin/deployiso.in      |  2 +-
 bin/manjaro-chroot.in |  2 +-
 bin/mkchrootpkg.in    |  4 ++--
 bin/signfile.in       |  2 +-
 lib/util-iso-boot.sh  |  8 ++++----
 lib/util.sh           | 17 +++++++++--------
 11 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index bad9b9b..4e3be3e 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -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)
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index 8d65a43..49a2382 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -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=()
 
diff --git a/bin/buildtree.in b/bin/buildtree.in
index b6a7df3..abc0e25 100644
--- a/bin/buildtree.in
+++ b/bin/buildtree.in
@@ -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
diff --git a/bin/check-yaml.in b/bin/check-yaml.in
index c1fb0e7..545ae23 100644
--- a/bin/check-yaml.in
+++ b/bin/check-yaml.in
@@ -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)
diff --git a/bin/checkpkg.in b/bin/checkpkg.in
index ed00f1b..b3517e8 100644
--- a/bin/checkpkg.in
+++ b/bin/checkpkg.in
@@ -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
diff --git a/bin/deployiso.in b/bin/deployiso.in
index 40157c4..46b836a 100644
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -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}
 
diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in
index c6769da..c716620 100644
--- a/bin/manjaro-chroot.in
+++ b/bin/manjaro-chroot.in
@@ -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
diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in
index 7afbe3c..8d1580a 100644
--- a/bin/mkchrootpkg.in
+++ b/bin/mkchrootpkg.in
@@ -303,7 +303,7 @@ main() {
         case "$arg" in
             c) clean_first=true ;;
             D) bindmounts_ro+=("$OPTARG") ;;
-			d) bindmounts_rw+=("$OPTARG") ;;
+            d) bindmounts_rw+=("$OPTARG") ;;
             u) update_first=true ;;
             r) passeddir="$OPTARG" ;;
             I) install_pkgs+=("$OPTARG") ;;
@@ -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
diff --git a/bin/signfile.in b/bin/signfile.in
index 95fc7e9..be8d88b 100644
--- a/bin/signfile.in
+++ b/bin/signfile.in
@@ -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
diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index a307d6e..6088a59 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -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
 }
 
diff --git a/lib/util.sh b/lib/util.sh
index 7a0ef31..8c04053 100644
--- a/lib/util.sh
+++ b/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}"