forked from mirrored-repos/manjaro-tools
Merge branch 'master' into office-installer-config
# Conflicts: # lib/util.sh
This commit is contained in:
commit
9932f4b8d0
3 changed files with 42 additions and 32 deletions
|
@ -216,7 +216,8 @@ pull_hp_repo(){
|
||||||
[[ -z $SRCDEST ]] && SRCDEST=${cache_dir}
|
[[ -z $SRCDEST ]] && SRCDEST=${cache_dir}
|
||||||
|
|
||||||
hp_repo=manjaro-homepage
|
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}"
|
cd "${SRCDEST}"
|
||||||
if [[ ! -d "${hp_repo}" ]]; then
|
if [[ ! -d "${hp_repo}" ]]; then
|
||||||
|
|
|
@ -370,6 +370,15 @@ write_settings_conf(){
|
||||||
fi
|
fi
|
||||||
echo '' >> "$conf"
|
echo '' >> "$conf"
|
||||||
echo "dont-chroot: false" >> "$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(){
|
configure_calamares(){
|
||||||
|
|
62
lib/util.sh
62
lib/util.sh
|
@ -246,10 +246,10 @@ init_buildpkg(){
|
||||||
|
|
||||||
get_iso_label(){
|
get_iso_label(){
|
||||||
local label="$1"
|
local label="$1"
|
||||||
#label="${label//_}" # relace all _
|
#label="${label//_}" # relace all _
|
||||||
label="${label//-}" # relace all -
|
label="${label//-}" # relace all -
|
||||||
label="${label^^}" # all uppercase
|
label="${label^^}" # all uppercase
|
||||||
label="${label::32}" # limit to 32 characters
|
label="${label::32}" # limit to 32 characters
|
||||||
echo ${label}
|
echo ${label}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,16 +316,16 @@ init_buildiso(){
|
||||||
[[ -z ${iso_compression} ]] && iso_compression='zstd'
|
[[ -z ${iso_compression} ]] && iso_compression='zstd'
|
||||||
|
|
||||||
[[ -z ${kernel} ]] && kernel="linux54"
|
[[ -z ${kernel} ]] && kernel="linux54"
|
||||||
|
|
||||||
load_run_dir "${profile_repo}"
|
load_run_dir "${profile_repo}"
|
||||||
|
|
||||||
if [[ -d ${run_dir}/.git ]]; then
|
if [[ -d ${run_dir}/.git ]]; then
|
||||||
current_path=$(pwd)
|
current_path=$(pwd)
|
||||||
cd ${run_dir}
|
cd ${run_dir}
|
||||||
branch=$(git rev-parse --abbrev-ref HEAD)
|
branch=$(git rev-parse --abbrev-ref HEAD)
|
||||||
cd ${current_path}
|
cd ${current_path}
|
||||||
else
|
else
|
||||||
[[ -z ${branch} ]] && branch="v18.0" #current branch release
|
[[ -z ${branch} ]] && branch="v18.0" #current branch release
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -z ${gpgkey} ]] && gpgkey=''
|
[[ -z ${gpgkey} ]] && gpgkey=''
|
||||||
|
@ -334,26 +334,26 @@ init_buildiso(){
|
||||||
}
|
}
|
||||||
|
|
||||||
init_calamares(){
|
init_calamares(){
|
||||||
|
|
||||||
|
[[ -z ${welcomestyle} ]] && welcomestyle=false
|
||||||
|
|
||||||
|
[[ -z ${welcomelogo} ]] && welcomelogo=true
|
||||||
|
|
||||||
|
[[ -z ${windowexp} ]] && windowexp=noexpand
|
||||||
|
|
||||||
|
[[ -z ${windowsize} ]] && windowsize="800px,560px"
|
||||||
|
|
||||||
[[ -z ${welcomestyle} ]] && welcomestyle=false
|
[[ -z ${windowplacement} ]] && windowplacement="center"
|
||||||
|
|
||||||
[[ -z ${welcomelogo} ]] && welcomelogo=true
|
[[ -z ${sidebarbackground} ]] && sidebarbackground=#454948
|
||||||
|
|
||||||
[[ -z ${windowexp} ]] && windowexp=noexpand
|
[[ -z ${sidebartext} ]] && sidebartext=#efefef
|
||||||
|
|
||||||
[[ -z ${windowsize} ]] && windowsize="800px,520px"
|
[[ -z ${sidebartextselect} ]] && sidebartextselect=#4d915e
|
||||||
|
|
||||||
[[ -z ${windowplacement} ]] && windowplacement="center"
|
[[ -z ${sidebartexthighlight} ]] && sidebartexthighlight=#1a1c1b
|
||||||
|
|
||||||
[[ -z ${sidebarbackground} ]] && sidebarbackground=#454948
|
|
||||||
|
|
||||||
[[ -z ${sidebartext} ]] && sidebartext=#efefef
|
|
||||||
|
|
||||||
[[ -z ${sidebartextselect} ]] && sidebartextselect=#4d915e
|
|
||||||
|
|
||||||
[[ -z ${sidebartexthighlight} ]] && sidebartexthighlight=#1a1c1b
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
init_deployiso(){
|
init_deployiso(){
|
||||||
|
|
||||||
|
@ -386,8 +386,8 @@ load_config(){
|
||||||
|
|
||||||
init_buildiso
|
init_buildiso
|
||||||
|
|
||||||
init_calamares
|
init_calamares
|
||||||
|
|
||||||
init_deployiso
|
init_deployiso
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in a new issue