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

Merge branch 'master' into office-installer-config

Browse source 
# Conflicts:
#	lib/util.sh
This commit is contained in:
Frede Hundewadt 2020-04-07 11:12:05 +02:00
commit 9932f4b8d0
No known key found for this signature in database
GPG key ID: 7605992471F3F073
3 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/util-publish.sh
View file

@ -216,7 +216,8 @@ pull_hp_repo(){
[[ -z $SRCDEST ]] && SRCDEST=${cache_dir}
hp_repo=manjaro-homepage
dl_file="${SRCDEST}/${hp_repo}/site/content/downloads/${edition}/${profile}.md"
[[ ${edition} == "manjaro" ]] && _edition="official" || _edition=${edition}
dl_file="${SRCDEST}/${hp_repo}/site/content/downloads/${_edition}/${profile}.md"
cd "${SRCDEST}"
if [[ ! -d "${hp_repo}" ]]; then

9
lib/util-yaml.sh
View file

@ -370,6 +370,15 @@ write_settings_conf(){
fi
echo '' >> "$conf"
echo "dont-chroot: false" >> "$conf"
if ${oem_used}; then
echo "oem-setup: true" >> "$conf"
echo "disable-cancel: true" >> "$conf"
else
echo "oem-setup: false" >> "$conf"
echo "disable-cancel: false" >> "$conf"
fi
echo "disable-cancel-during-exec: true" >> "$conf"
echo "quit-at-end: false" >> "$conf"
}
configure_calamares(){

2
lib/util.sh
View file

@ -341,7 +341,7 @@ init_calamares(){
[[ -z ${windowexp} ]] && windowexp=noexpand
[[ -z ${windowsize} ]] && windowsize="800px,520px"
[[ -z ${windowsize} ]] && windowsize="800px,560px"
[[ -z ${windowplacement} ]] && windowplacement="center"