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

change override filename

Browse source
This commit is contained in:
udeved 2014-12-08 22:58:38 +01:00
parent 3306b86bd3
commit 4c88d4781f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/build-set.in
View file

@ -217,9 +217,9 @@ else
USER_HOME=$HOME
fi
load_config "$USER_HOME/.config/.manjaro-tools.conf"
load_config "$USER_HOME/.config/manjaro-tools.conf"
load_vars "$USER_HOME/.config/.makepkg.conf"
load_vars "$USER_HOME/.makepkg.conf"
load_vars /etc/makepkg.conf
pacman_conf_arch='default'

10
bin/buildiso.in
View file

@ -329,10 +329,10 @@ make_de_image() {
# copy over manjaro-tools.conf
[[ ! -d ${mtools} ]] && mkdir ${mtools}
if [[ -f $USER_HOME/.config/.manjaro-tools.conf ]]; then
cp $USER_HOME/.config/.manjaro-tools.conf ${mtools}/.manjaro-tools.conf
if [[ -f $USER_HOME/.config/manjaro-tools.conf ]]; then
cp $USER_HOME/.config/manjaro-tools.conf ${mtools}/manjaro-tools.conf
else
cp /etc/manjaro-tools/manjaro-tools.conf ${mtools}/.manjaro-tools.conf
cp /etc/manjaro-tools/manjaro-tools.conf ${mtools}/manjaro-tools.conf
fi
umount -l ${work_dir}/${desktop}-image
@ -467,7 +467,6 @@ make_lng_image() {
fi
}
load_config '@sysconfdir@/manjaro-tools.conf'
iso_owner=${SUDO_USER:-$USER}
@ -477,7 +476,8 @@ else
USER_HOME=$HOME
fi
load_config "$USER_HOME/.config/.manjaro-tools.conf"
load_config "$USER_HOME/.config/manjaro-tools.conf"
load_config '@sysconfdir@/manjaro-tools.conf'
load_desktop_definitions