From 9417659ac106ed0267d1478fec0b18cf5221a801 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 1 Jan 2012 22:30:14 -0600 Subject: [PATCH] script/makepkg: releng/9.0 changed bourne shell syntax slightly --- script/makepkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/makepkg b/script/makepkg index b57b43e..fdb99e5 100755 --- a/script/makepkg +++ b/script/makepkg @@ -71,7 +71,7 @@ EOF # Set up chroot mounts and runtime configuration chstartup() { [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" - chup? && return 0 + chup && return 0 # Rollback if a problem occurs during startup trap "chshutdown" exit hup int term kill @@ -100,7 +100,7 @@ chstartup() { } # Check if the chroot is probably ready for use -chup?() { +chup() { [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -c "${chroot_dir}/dev/null" ] return $? } @@ -109,7 +109,7 @@ chup?() { chshutdown() { # Short-circuit if nothing is mounted mount | grep -q "${chroot_dir}" || return 0 - chup? && port_save_config || meh "Not saving port config" + chup && port_save_config || meh "Not saving port config" meh "Shutting down chroot" umount "${chroot_dir}/var/ports/distfiles" umount "${chroot_dir}/usr/ports" @@ -129,7 +129,7 @@ chdestroy() { # Evaluate a command line within the chroot cheval() { - chup? || wtf "Chroot not ready" + chup || wtf "Chroot not ready" chroot "${chroot_dir}" env -i ${chroot_env} /bin/sh -c "cd ${chroot_pkg_dir}; ${*}" return $? } -- 2.42.0