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

make copy function

Browse source
This commit is contained in:
udeved 2014-12-08 23:35:39 +01:00
parent 2566885409
commit e43c34a31b
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bin/buildiso.in
View file

@ -325,15 +325,8 @@ make_de_image() {
sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" ${work_dir}/${desktop}-image/etc/plymouth/plymouthd.conf
fi
local mtools=${work_dir}/${desktop}-image/etc/skel/.config
# 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
else
cp /etc/manjaro-tools/manjaro-tools.conf ${mtools}/manjaro-tools.conf
fi
copy_manjaro_tools_conf
umount -l ${work_dir}/${desktop}-image
rm -R ${work_dir}/${desktop}-image/.wh*
@ -342,6 +335,19 @@ make_de_image() {
fi
}
copy_manjaro_tools_conf(){
local mtools=$1/etc/skel/.config
[[ ! -d ${mtools} ]] && mkdir ${mtools}
if [[ -f $USER_HOME/.config/manjaro-tools.conf ]]; then
msg2 "Copying $USER_HOME/.config/manjaro-tools.conf ..."
cp $USER_HOME/.config/manjaro-tools.conf ${mtools}/manjaro-tools.conf
else
msg2 "Copying ${manjaro_tools_conf} ..."
cp ${manjaro_tools_conf} ${mtools}/manjaro-tools.conf
fi
}
make_pkgs_image() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare pkgs-image"