projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix use of `eend` in `cleanup` function
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
cff0116
..
4758bce
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-244,11
+244,11
@@
check4progs(){
# helper functions {{{
cleanup() {
if [ -n "$CHROOT_VARIABLES" ] ; then
# helper functions {{{
cleanup() {
if [ -n "$CHROOT_VARIABLES" ] ; then
- einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES"
;
eend $?
+ einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES"
||
eend $?
fi
if [ -n "$STAGES" ] ; then
fi
if [ -n "$STAGES" ] ; then
- einfo "Removing ${STAGES}" ; rmdir "$STAGES"
;
eend $?
+ einfo "Removing ${STAGES}" ; rmdir "$STAGES"
||
eend $?
fi
if [ -n "$ARM_EFI_TARGET" ]; then
fi
if [ -n "$ARM_EFI_TARGET" ]; then
@@
-257,7
+257,9
@@
cleanup() {
# Remove temporary mountpoint again
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
# Remove temporary mountpoint again
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
- rmdir "$MNTPOINT" 2>/dev/null
+ if [ -d "$MNTPOINT" ] ; then
+ rmdir "$MNTPOINT"
+ fi
fi
# make sure $TARGET is not mounted when exiting grml-debootstrap
fi
# make sure $TARGET is not mounted when exiting grml-debootstrap
@@
-297,8
+299,10
@@
cleanup() {
# remove directory only if we used the default with process id inside the name
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
# remove directory only if we used the default with process id inside the name
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
- einfo "Removing directory ${MNTPOINT}"
- rmdir "$MNTPOINT" || eend $?
+ if test -d "$MNTPOINT" ; then
+ einfo "Removing directory ${MNTPOINT}"
+ rmdir "$MNTPOINT" || eend $?
+ fi
fi
fi
fi
fi
fi
fi