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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/debian/sid | 4 | ||||
| -rw-r--r-- | scripts/ubuntu/breezy | 2 | ||||
| -rw-r--r-- | scripts/ubuntu/dapper | 2 | ||||
| -rw-r--r-- | scripts/ubuntu/edgy | 2 | ||||
| -rw-r--r-- | scripts/ubuntu/feisty | 2 | ||||
| -rw-r--r-- | scripts/ubuntu/gutsy | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/scripts/debian/sid b/scripts/debian/sid index 85ebd05..0d65651 100644 --- a/scripts/debian/sid +++ b/scripts/debian/sid @@ -17,7 +17,7 @@ fi work_out_debs () { LIBC=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC="libc6.1" elif [ "$ARCH" = "hurd-i386" ]; then LIBC="libc0.3" @@ -52,7 +52,7 @@ first_stage_install () { chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi - if [ -x "$TARGET/usr/bin/md5sum.textutils" -a \! -e "$TARGET/usr/bin/md5sum" ]; then + if [ -x "$TARGET/usr/bin/md5sum.textutils" ] && [ \! -e "$TARGET/usr/bin/md5sum" ]; then cp "$TARGET/usr/bin/md5sum.textutils" "$TARGET/usr/bin/md5sum" fi diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy index 71d8a53..13a9747 100644 --- a/scripts/ubuntu/breezy +++ b/scripts/ubuntu/breezy @@ -6,7 +6,7 @@ variants - buildd work_out_debs () { LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi required="$(get_debs Priority: required)" diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper index 18d19aa..282a522 100644 --- a/scripts/ubuntu/dapper +++ b/scripts/ubuntu/dapper @@ -13,7 +13,7 @@ variants - buildd work_out_debs () { LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi required="$(get_debs Priority: required)" diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy index efdc146..c1b7885 100644 --- a/scripts/ubuntu/edgy +++ b/scripts/ubuntu/edgy @@ -17,7 +17,7 @@ fi work_out_debs () { LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi required="$(get_debs Priority: required)" diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty index b317c68..6b8b70f 100644 --- a/scripts/ubuntu/feisty +++ b/scripts/ubuntu/feisty @@ -17,7 +17,7 @@ fi work_out_debs () { LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi required="$(get_debs Priority: required)" diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy index 4353812..40aa3db 100644 --- a/scripts/ubuntu/gutsy +++ b/scripts/ubuntu/gutsy @@ -17,7 +17,7 @@ fi work_out_debs () { LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi required="$(get_debs Priority: required)" |