forked from mirrored-repos/manjaro-tools
Tweak mkiso error msg
This commit is contained in:
parent
74a850c94d
commit
409da2efa5
1 changed files with 2 additions and 8 deletions
10
bin/mkiso.in
10
bin/mkiso.in
|
@ -153,14 +153,12 @@ _mkchroot(){
|
||||||
setarch "${ARCH}" \
|
setarch "${ARCH}" \
|
||||||
mkchroot -C ${PACCONFIG} \
|
mkchroot -C ${PACCONFIG} \
|
||||||
-S ${MIRRORS} \
|
-S ${MIRRORS} \
|
||||||
"${work_dir}/${IMAGE_FOLDER}" $@ &> /dev/null || die "Failed to download all packages."
|
"${work_dir}/${IMAGE_FOLDER}" $@ &> /dev/null || die "Failed to retrieve one or more packages!"
|
||||||
#ret=$?
|
|
||||||
else
|
else
|
||||||
setarch "${ARCH}" \
|
setarch "${ARCH}" \
|
||||||
mkchroot -C ${PACCONFIG} \
|
mkchroot -C ${PACCONFIG} \
|
||||||
-S ${MIRRORS} \
|
-S ${MIRRORS} \
|
||||||
"${work_dir}/${IMAGE_FOLDER}" $@ || die "Failed to download all packages."
|
"${work_dir}/${IMAGE_FOLDER}" $@ || die "Failed to retrieve one or more packages!"
|
||||||
#ret=$?
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${work_dir}/root-image/etc/locale.gen" ]; then
|
if [ -e "${work_dir}/root-image/etc/locale.gen" ]; then
|
||||||
|
@ -169,10 +167,6 @@ _mkchroot(){
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
||||||
|
|
||||||
# if [ $ret -ne 0 ]; then
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
command_create () {
|
command_create () {
|
||||||
|
|
Loading…
Reference in a new issue