From: thib <thib>
Date: Wed, 14 Feb 2001 13:48:30 +0000 (+0000)
Subject: "read -p" has been replaced by "echo -n ; read" (not supported by sh)
X-Git-Tag: ver1564~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41106fd2757690951f5ef43cb387d6a3ba380b04;p=fcron

"read -p" has been replaced by "echo -n ; read" (not supported by sh)
---

diff --git a/script/boot-install b/script/boot-install
index 0adbff3..0a8ba9d 100755
--- a/script/boot-install
+++ b/script/boot-install
@@ -2,7 +2,7 @@
 # Install fcron under SysV system.
 #
 
-# $Id: boot-install,v 1.26 2001-02-11 21:37:41 thib Exp $
+# $Id: boot-install,v 1.27 2001-02-14 13:49:36 thib Exp $
 
 # take 5 arguments : the name of the BSD-like install program (with "-o" and the correct username)
 #                    the DESTSBIN directory
@@ -57,7 +57,8 @@ if test $IS_FREEBSD -eq 1; then
       while test \( ! -z "$INSTALL" \) -a \( "$INSTALL" != "y" \) -a \( "$INSTALL" != "n" \);
       do
         echo "Would you like to add fcron.sh script in the directory /usr/local/etc/rc.d/ ?"
-        read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+        echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+        read INSTALL NOTHING
       done
     # automatic answer given by configure script (option --with-answer-all)
     elif test $ANSWER -eq 1; then
@@ -95,7 +96,8 @@ if test -f /etc/rc.d/rc.M; then
         while test \( ! -z "$INSTALL" \) -a \( "$INSTALL" != "y" \) -a \( "$INSTALL" != "n" \);
         do
           echo "Would you like to add $STARTCMD in the file /etc/rc.d/rc.local ?"
-          read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+          echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+          read INSTALL NOTHING
         done
       # automatic answer given by configure script (option --with-answer-all)
       elif test $ANSWER -eq 1; then
@@ -130,7 +132,8 @@ if test \( ! "$INSTALLED" -eq 1 \) -a \( "$ROOTDIR" != "" \); then
     do
       echo "Would you like to add fcron in the directory $ROOTDIR/init.d/ and in runlevel 2, 3, 4 and 5"
       echo "(directories $ROOTDIR/rc{2,3,4,5}.d/) ?"
-      read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+      echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+      read INSTALL NOTHING
     done
   # automatic answer given by configure script (option --with-answer-all)
   elif test $ANSWER -eq 1; then
@@ -179,7 +182,8 @@ if test \( ! "$INSTALLED" -eq 1 \) -a \( -f /etc/rc \) ; then
         while test \( ! -z "$INSTALL" \) -a \( "$INSTALL" != "y" \) -a \( "$INSTALL" != "n" \);
         do
           echo "Would you like to add $STARTCMD in the file /etc/rc.local ?"
-          read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+          echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+          read INSTALL NOTHING
         done
       # automatic answer given by configure script (option --with-answer-all)
       elif test $ANSWER -eq 1; then
@@ -238,7 +242,8 @@ else
       echo "Would you like to do it with a '"$KILLSTR"'"
       echo $COMMENT
       echo "followed by a '"$CMD"' ?"
-      read -p "Please answer with 'y' or 'n' (default: 'y'): " RESTART NOTHING
+      echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+      read RESTART NOTHING
     done
     # automatic answer given by configure script (option --with-answer-all)
   elif test $ANSWER -eq 1; then
@@ -275,7 +280,8 @@ if test "$RESTARTED" -eq 1; then
     while test \( ! -z "$REINSTALL" \) -a \( "$REINSTALL" != "y" \) -a \( "$REINSTALL" != "n" \);
     do
       echo "Would you like to do it now ?"
-      read -p "Please answer with 'y' or 'n' (default: 'y'): " REINSTALL NOTHING
+      echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+      read REINSTALL NOTHING
     done
   elif test $ANSWER -eq 1; then
     REINSTALL="y"
diff --git a/script/user-group b/script/user-group
index eeafed3..d2a88b6 100755
--- a/script/user-group
+++ b/script/user-group
@@ -4,7 +4,7 @@
 #  them if necessary.
 #
 
-# $Id: user-group,v 1.5 2001-02-11 21:16:08 thib Exp $
+# $Id: user-group,v 1.6 2001-02-14 13:48:30 thib Exp $
 
 # take 3 arguments : 	username
 # 			groupname
@@ -54,7 +54,8 @@ else
     do
       echo "Would you like to add $USERNAME in /etc/passwd with the following command ?"
       echo "    $CMD"
-      read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+      echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+      read INSTALL NOTHING
     done
     if test \( -z "$INSTALL" \) -o \( "$INSTALL" = "y" \); then
       if $CMD; then
@@ -103,7 +104,8 @@ else
     do
       echo "Would you like to add $GROUPNAME in /etc/passwd with the following command ?"
       echo "    $CMD"
-      read -p "Please answer with 'y' or 'n' (default: 'y'): " INSTALL NOTHING
+      echo -n "Please answer with 'y' or 'n' (default: 'y'): "
+      read INSTALL NOTHING
     done
     if test \( -z "$INSTALL" \) -o \( "$INSTALL" = "y" \); then
       if $CMD; then