diff options
| author | Colin Watson <cjwatson@debian.org> | 2007-10-19 09:35:54 (GMT) |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2007-10-19 09:35:54 (GMT) |
| commit | 50f4c4f5f10b5ccc0fe1b04e6184b8dad70ebbe1 (patch) | |
| tree | 1d057336b464c3be51e662dfa96257d30cf3518b /debootstrap | |
| parent | 21ea0f1404e275d4977df808c9c56442eafda75f (diff) | |
| download | debootstrap-50f4c4f5f10b5ccc0fe1b04e6184b8dad70ebbe1.zip debootstrap-50f4c4f5f10b5ccc0fe1b04e6184b8dad70ebbe1.tar.gz debootstrap-50f4c4f5f10b5ccc0fe1b04e6184b8dad70ebbe1.tar.bz2 | |
* Don't rely on XSI test(1) extensions.
r49819
Diffstat (limited to 'debootstrap')
| -rwxr-xr-x | debootstrap | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debootstrap b/debootstrap index 8ba7769..7d1bb5a 100755 --- a/debootstrap +++ b/debootstrap @@ -264,7 +264,7 @@ if [ "$SECOND_STAGE_ONLY" = "true" ]; then fi SCRIPT=$DEBOOTSTRAP_DIR/suite-script else - if [ "$1" = "" -o "$2" = "" ]; then + if [ "$1" = "" ] || [ "$2" = "" ]; then usage_err 1 NEEDSUITETARGET "You must specify a suite and a target." fi SUITE="$1" @@ -279,7 +279,7 @@ else fi SCRIPT="$DEBOOTSTRAP_DIR/scripts/$1" - if [ -n "$VARIANT" -a -e "${SCRIPT}.${VARIANT}" ]; then + if [ -n "$VARIANT" ] && [ -e "${SCRIPT}.${VARIANT}" ]; then SCRIPT="${SCRIPT}.${VARIANT}" SUPPORTED_VARIANTS="$VARIANT" fi @@ -391,7 +391,7 @@ fi ########################################################################### if am_doing_phase finddebs; then - if [ "$FINDDEBS_NEEDS_INDICES" = "true" -o "$RESOLVE_DEPS" = "true" ]; then + if [ "$FINDDEBS_NEEDS_INDICES" = "true" ] || [ "$RESOLVE_DEPS" = "true" ]; then download_indices GOT_INDICES=true fi |