From d59cb537d5cfff03ea2e66e28e12c6d1c18d50a2 Mon Sep 17 00:00:00 2001 From: Bill Fumerola Date: Sun, 28 May 2000 06:43:40 +0000 Subject: [PATCH] If a user didn't have /usr/sbin in their path, this would have failed. --- mail/postfix-current/pkg-install | 12 ++++++------ mail/postfix/pkg-install | 12 ++++++------ mail/postfix1/pkg-install | 12 ++++++------ mail/postfix20/pkg-install | 12 ++++++------ mail/postfix21/pkg-install | 12 ++++++------ mail/postfix22/pkg-install | 12 ++++++------ mail/postfix23/pkg-install | 12 ++++++------ mail/postfix24/pkg-install | 12 ++++++------ mail/postfix25/pkg-install | 12 ++++++------ mail/postfix26/pkg-install | 12 ++++++------ mail/postfix27/pkg-install | 12 ++++++------ mail/postfix28/pkg-install | 12 ++++++------ 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix-current/pkg-install +++ b/mail/postfix-current/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix/pkg-install +++ b/mail/postfix/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix1/pkg-install +++ b/mail/postfix1/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix20/pkg-install +++ b/mail/postfix20/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix21/pkg-install +++ b/mail/postfix21/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix22/pkg-install +++ b/mail/postfix22/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix23/pkg-install +++ b/mail/postfix23/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix24/pkg-install +++ b/mail/postfix24/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix25/pkg-install +++ b/mail/postfix25/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix26/pkg-install +++ b/mail/postfix26/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix27/pkg-install +++ b/mail/postfix27/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install index 4ed960fb5bdc..dcc7c370d885 100644 --- a/mail/postfix28/pkg-install +++ b/mail/postfix28/pkg-install @@ -34,12 +34,12 @@ yesno() { } if [ x"$2" = xPRE-INSTALL ]; then - if pw groupshow "${group}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then echo "You already have a group \"${group}\", so I will use it." else echo "You need a group \"${group}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group} -h - || exit + /usr/sbin/pw groupadd ${group} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -47,12 +47,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw groupshow "${group2}" 2>/dev/null; then + if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then echo "You already have a group \"${group2}\", so I will use it." else echo "You need a group \"${group2}\"." if yesno "Would you like me to create it" y; then - pw groupadd ${group2} -h - || exit + /usr/sbin/pw groupadd ${group2} -h - || exit echo "Done." else echo "Please create it, and try again." @@ -60,12 +60,12 @@ if [ x"$2" = xPRE-INSTALL ]; then fi fi - if pw user show "${user}" 2>/dev/null; then + if /usr/sbin/pw user show "${user}" 2>/dev/null; then echo "You already have a user \"${user}\", so I will use it." else echo "You need a user \"${user}\"." if yesno "Would you like me to create it" y; then - pw useradd ${user} -g ${group} -h - -d /nonexistent \ + /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \ -s /nonexistent -c "Postfix Mail System" || exit echo "Done." else