Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel
This commit is contained in:
commit
7522f8da23
2 changed files with 10 additions and 9 deletions
|
@ -116,19 +116,15 @@ write_calamares_users_conf(){
|
|||
|
||||
brand_calamares_settings_conf(){
|
||||
local conf="$1/usr/share/calamares/settings.conf"
|
||||
|
||||
if [[ ${iso_name} == 'manjaro' ]];then
|
||||
local branding="$1/usr/share/calamares/branding/${iso_name}-${custom}"
|
||||
if [[ -d $branding ]];then
|
||||
sed -i -e "s|branding: manjaro|branding: ${iso_name}-${custom}|g" "$conf"
|
||||
fi
|
||||
local branding="$1/usr/share/calamares/branding/${iso_name}-${custom}"
|
||||
if [[ -d $branding ]];then
|
||||
sed -i -e "s|^.*branding:.*|branding: ${iso_name}-${custom}|" "$conf"
|
||||
else
|
||||
local branding="$1/usr/share/calamares/branding/${iso_name}"
|
||||
if [[ -d $branding ]];then
|
||||
sed -i -e "s|branding: manjaro|branding: ${iso_name}|g" "$conf"
|
||||
sed -i -e "s|^.*branding:.*|branding: ${iso_name}|" "$conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
configure_calamares(){
|
||||
|
|
|
@ -245,7 +245,12 @@ make_image_custom() {
|
|||
fi
|
||||
|
||||
pacman -Qr "${path}" > "${path}/${custom}-image-pkgs.txt"
|
||||
cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt
|
||||
if [[ ${initsys} == 'openrc' ]];then
|
||||
local pkgs_file="${iso_name}-${custom}-${initsys}-${dist_release}-${arch}-pkgs.txt"
|
||||
else
|
||||
local pkgs_file="${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt"
|
||||
fi
|
||||
cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${pkgs_file}
|
||||
[[ -d ${custom}-overlay ]] && copy_overlay_custom
|
||||
configure_custom_image "${path}"
|
||||
${is_custom_pac_conf} && clean_pacman_conf "${path}"
|
||||
|
|
Loading…
Reference in a new issue