X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.debootstrap;h=28242924918c6228de2d33bf4ab75ec68a715c2a;hb=cb8c63292ca30eeeb44f649198a67b095bdf6e8c;hp=a69f4865d68b7972d4e5c00392efad0cf8522b8b;hpb=0cde5f56b50bd0a29196d327d3f44ec6a023f06d;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index a69f486..2824292 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -17,7 +17,7 @@ function cleanUp { - test ! -d "$workdir" || rm -rf "$workdir" + test ! -d "$workdir" || $_RM -rf "$workdir" } function init @@ -50,7 +50,7 @@ function findDebootstrap { pushd . &>/dev/null DEBOOTSTRAP=$(which debootstrap 2>/dev/null) || { - dir=$(mktemp -d /var/tmp/debootstrap.XXXXXX) + dir=$($_MKTEMPDIR /var/tmp/debootstrap.XXXXXX) workdir=$dir dst=$dir/debootstrap.deb @@ -60,7 +60,7 @@ function findDebootstrap (/*) ln -s "$tmp" "$dst";; (http://*|ftp://*) $_WGET -nv -O "$dst" "$tmp" || { - cat <&2 + $_CAT <&2 ERROR: Could not download the debootstrap package from $dst @@ -96,8 +96,8 @@ EOF function fixupDebian { - rm -rf "$1"/dev - mv "$1"/dev.X "$1"/dev + $_RM -rf "$1"/dev + $_MV "$1"/dev.X "$1"/dev }