forked from mirrored-repos/manjaro-tools
Revert last commit
Signed-off-by: Ste74 <stefano@manjaro.org>
This commit is contained in:
parent
2612c97ed2
commit
277ec0ca3c
3 changed files with 4 additions and 11 deletions
|
@ -156,7 +156,6 @@ usage() {
|
||||||
echo " [default: ${gpgkey}]"
|
echo " [default: ${gpgkey}]"
|
||||||
echo ' -m Set SquashFS image mode to persistence'
|
echo ' -m Set SquashFS image mode to persistence'
|
||||||
echo ' -c Disable clean work dir'
|
echo ' -c Disable clean work dir'
|
||||||
echo ' -f Build full iso (extra=true)'
|
|
||||||
echo ' -x Build images only'
|
echo ' -x Build images only'
|
||||||
echo ' -z Generate iso only'
|
echo ' -z Generate iso only'
|
||||||
echo ' Requires pre built images (-x)'
|
echo ' Requires pre built images (-x)'
|
||||||
|
@ -170,7 +169,7 @@ usage() {
|
||||||
|
|
||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
opts='p:a:b:r:t:k:i:g:cfzxmvqh'
|
opts='p:a:b:r:t:k:i:g:czxmvqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
|
@ -183,7 +182,6 @@ while getopts "${opts}" arg; do
|
||||||
i) initsys="$OPTARG" ;;
|
i) initsys="$OPTARG" ;;
|
||||||
g) gpgkey="$OPTARG" ;;
|
g) gpgkey="$OPTARG" ;;
|
||||||
c) clean_first=false ;;
|
c) clean_first=false ;;
|
||||||
f) full_iso=true ;;
|
|
||||||
x) images_only=true ;;
|
x) images_only=true ;;
|
||||||
z) iso_only=true ;;
|
z) iso_only=true ;;
|
||||||
m) persist=true ;;
|
m) persist=true ;;
|
||||||
|
|
|
@ -260,9 +260,6 @@ gen_iso_fn(){
|
||||||
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
|
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
|
||||||
vars+=("${dist_release}")
|
vars+=("${dist_release}")
|
||||||
vars+=("${target_branch}")
|
vars+=("${target_branch}")
|
||||||
|
|
||||||
! [[ ${full_iso} ]] && vars+=("minimal")
|
|
||||||
|
|
||||||
vars+=("${target_arch}")
|
vars+=("${target_arch}")
|
||||||
for n in ${vars[@]};do
|
for n in ${vars[@]};do
|
||||||
name=${name:-}${name:+-}${n}
|
name=${name:-}${name:+-}${n}
|
||||||
|
|
|
@ -379,8 +379,6 @@ load_profile_config(){
|
||||||
|
|
||||||
[[ -z ${smb_workgroup} ]] && smb_workgroup=''
|
[[ -z ${smb_workgroup} ]] && smb_workgroup=''
|
||||||
|
|
||||||
[[ ${full_iso} != none ]] && extra='true'
|
|
||||||
|
|
||||||
basic='true'
|
basic='true'
|
||||||
[[ -z ${extra} ]] && extra='false'
|
[[ -z ${extra} ]] && extra='false'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue