forked from mirrored-repos/manjaro-tools
reset variables
rename to office_installer updated pacman-mirrors.conf
This commit is contained in:
parent
25b3bc1d61
commit
76d6d697e1
3 changed files with 10 additions and 1 deletions
|
@ -242,6 +242,7 @@ Usage: buildiso [options]
|
||||||
[default: linux49]
|
[default: linux49]
|
||||||
-l Create permalink
|
-l Create permalink
|
||||||
-m Set SquashFS image mode to persistence
|
-m Set SquashFS image mode to persistence
|
||||||
|
-o Enable office installer
|
||||||
-p <profile> Buildset or profile [default: default]
|
-p <profile> Buildset or profile [default: default]
|
||||||
-q Query settings and pretend build
|
-q Query settings and pretend build
|
||||||
-r <dir> Chroots directory
|
-r <dir> Chroots directory
|
||||||
|
|
|
@ -10,6 +10,10 @@ Branch = stable
|
||||||
## 2) random - randomly generate the output mirrorlist
|
## 2) random - randomly generate the output mirrorlist
|
||||||
# Method = rank
|
# Method = rank
|
||||||
|
|
||||||
|
## Filename to use when ranking mirrors
|
||||||
|
## The file must be present in core repo
|
||||||
|
# TestFile = core.db.tar.gz
|
||||||
|
|
||||||
## Define protocols and priority
|
## Define protocols and priority
|
||||||
## separated by comma 'https,http' or 'http,https'
|
## separated by comma 'https,http' or 'http,https'
|
||||||
## ATM available protocols are: http, https, ftp
|
## ATM available protocols are: http, https, ftp
|
||||||
|
|
|
@ -462,6 +462,8 @@ load_profile_config(){
|
||||||
|
|
||||||
[[ -z ${office_installer} ]] && office_installer="false"
|
[[ -z ${office_installer} ]] && office_installer="false"
|
||||||
|
|
||||||
|
[[ -z ${permalink} ]] && permalink="false"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -508,6 +510,8 @@ reset_profile(){
|
||||||
unset geoip
|
unset geoip
|
||||||
unset extra
|
unset extra
|
||||||
unset full_iso
|
unset full_iso
|
||||||
|
unset office_installer
|
||||||
|
unset permalink
|
||||||
}
|
}
|
||||||
|
|
||||||
check_profile(){
|
check_profile(){
|
||||||
|
@ -625,7 +629,7 @@ load_pkgs(){
|
||||||
esac
|
esac
|
||||||
|
|
||||||
local _office _office_rm
|
local _office _office_rm
|
||||||
if ${office_chooser}; then
|
if ${office_installer}; then
|
||||||
_office="s|>office||g"
|
_office="s|>office||g"
|
||||||
else
|
else
|
||||||
_office_rm="s|>office.*||g"
|
_office_rm="s|>office.*||g"
|
||||||
|
|
Loading…
Reference in a new issue