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

set default switches on

Browse source
This commit is contained in:
udeved 2014-12-17 18:15:44 +01:00
parent 285b5d7291
commit 78c419b1fe
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
bin/buildiso.in
View file

@ -54,14 +54,16 @@ display_settings(){
msg "IMAGES SETTINGS:"
msg2 "manjaro_kernel: ${manjaro_kernel}"
msg2 "manjaro_kernel_ver: ${manjaro_kernel_ver}"
msg2 "manjaro_version: ${manjaro_version}"
msg2 "displaymanager: ${displaymanager}"
msg2 "plymouth_theme: ${plymouth_theme}"
if ${auto_svc_conf};then
msg2 "start_systemd: ${start_systemd[*]}"
msg2 "start_openrc: ${start_openrc[*]}"
if [[ ${initsys} == "systemd" ]];then
msg2 "start_systemd: ${start_systemd[*]}"
else
msg2 "start_openrc: ${start_openrc[*]}"
fi
fi
msg "ISO SETTINGS:"
@ -82,8 +84,11 @@ display_settings(){
msg2 "hostname: ${hostname}"
if ${auto_svc_conf};then
msg2 "start_systemd_live: ${start_systemd_live[*]}"
msg2 "start_openrc_live: ${start_openrc_live[*]}"
if [[ ${initsys} == "systemd" ]];then
msg2 "start_systemd_live: ${start_systemd_live[*]}"
else
msg2 "start_openrc_live: ${start_openrc_live[*]}"
fi
fi
}
@ -102,14 +107,14 @@ load_config "${SYSCONFDIR}/manjaro-tools.conf"
load_desktop_definition
clean_first=false
clean_first=true
pretend=false
high_compression=false
high_compression=true
verbose=false
overwrite=false
overwrite=true
xorg_overlays=false
kde_lng_packages=false
auto_svc_conf=false
auto_svc_conf=true
images_only=false
iso_only=false
is_cache_pkgs=false
@ -119,26 +124,30 @@ pacman_conf_arch='default'
usage() {
echo "Usage: ${0##*/} [options]"
echo " -a <arch> Set arch [default: ${arch}]"
echo " -b <branch> Set branch [default: ${branch}]"
echo " -r <dir> Work directory [default: ${work_dir}]"
echo " -t <dir> Target iso directory [default: ${target_dir}]"
echo ' -a <arch> Set arch'
echo " [default: ${arch}]"
echo ' -b <branch> Set branch'
echo " [default: ${branch}]"
echo ' -r <dir> Work directory'
echo " [default: ${work_dir}]"
echo ' -t <dir> Target iso directory'
echo " [default: ${target_dir}]"
echo " -i <file> Config file for pacman"
echo " [default: ${PKGDATADIR}/pacman-${pacman_conf_arch}.conf]"
echo ' -c Clean work dir'
echo ' -v Verbose'
echo ' -f Overwrite'
echo ' -z High compression'
echo ' -x Xorg overlays'
echo ' -k kde lng packages'
echo ' -I Build images only'
echo ' -q Query settings and pretend build'
echo ' -c Disable clean work dir'
echo ' -f Disable iso image verwrite'
echo ' -z Disable High compression'
echo ' -A Disable auto configure livecd services as specified'
echo ' in manjaro-tools.conf'
echo ' -X Xorg overlays'
echo ' -K kde lng packages'
echo ' -B Build images only'
echo ' -G Generate iso only'
echo ' Requires pre built images'
echo ' -P Use custom pkgs cache, useful for image rebuilds'
echo ' -L Use custom lng cache, useful for image rebuilds'
echo ' -A Auto configure livecd services as specified'
echo ' in the manjaro-tools.conf'
echo ' -q Query settings and pretend build'
echo ' Requires pre built images'
echo ' -h This help'
echo ''
echo ''
@ -147,7 +156,7 @@ usage() {
orig_argv=("$@")
opts='a:b:r:t:i:cvfzqxkAIGPLh'
opts='a:b:r:t:i:cvfzqXKABGPLh'
while getopts "${opts}" arg; do
case "${arg}" in
@ -155,15 +164,15 @@ while getopts "${opts}" arg; do
b) branch="$OPTARG" ;;
r) work_dir="$OPTARG" ;;
t) target_dir="$OPTARG" ;;
c) clean_first=true ;;
v) verbose=true; iso_args+=(-v) ;;
f) overwrite=true; iso_args+=(-f) ;;
z) high_compression=true; iso_args+=(-x) ;;
x) xorg_overlays=true ;;
k) kde_lng_packages=true ;;
i) pacman_conf="$OPTARG" ;;
A) auto_svc_conf=true ;;
I) images_only=true ;;
c) clean_first=false ;;
v) verbose=true; iso_args+=(-v) ;;
f) overwrite=false; iso_args+=(-f) ;;
z) high_compression=false; iso_args+=(-x) ;;
X) xorg_overlays=true ;;
K) kde_lng_packages=true ;;
A) auto_svc_conf=false ;;
B) images_only=true ;;
G) iso_only=true ;;
P) is_cache_pkgs=true ;;
L) is_cache_lng=true ;;