|
 |
0d6b98 |
From bb7f25fad3cade493486a6287f5212cdfb6cce24 Mon Sep 17 00:00:00 2001
|
|
|
0d6b98 |
From: Jari Aalto <jari.aalto@cante.net>
|
|
|
0d6b98 |
Date: Sat, 8 May 2010 20:15:35 +0300
|
|
|
0d6b98 |
Subject: [PATCH 6/9] contrib/ocs: Fix bashims (Closes: #480591)
|
|
|
0d6b98 |
|
|
|
0d6b98 |
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
|
|
|
0d6b98 |
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
|
|
|
0d6b98 |
---
|
|
|
0d6b98 |
contrib/ocs | 16 ++++++++--------
|
|
|
0d6b98 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
0d6b98 |
|
|
|
0d6b98 |
diff --git a/contrib/ocs b/contrib/ocs
|
|
|
0d6b98 |
index e924f4f..bd556b4 100755
|
|
|
0d6b98 |
--- a/contrib/ocs
|
|
|
0d6b98 |
+++ b/contrib/ocs
|
|
|
0d6b98 |
@@ -86,7 +86,7 @@ if [ ! -d ${SYSDIR} ]; then
|
|
|
0d6b98 |
fi
|
|
|
0d6b98 |
|
|
|
0d6b98 |
# Check that cscope is in PATH
|
|
|
0d6b98 |
-type cscope 1>/dev/null 2>&1
|
|
|
0d6b98 |
+which cscope 1>/dev/null 2>&1
|
|
|
0d6b98 |
|
|
|
0d6b98 |
if [ $? -ne 0 ]
|
|
|
0d6b98 |
then
|
|
|
0d6b98 |
@@ -167,8 +167,8 @@ create_list()
|
|
|
0d6b98 |
|
|
|
0d6b98 |
if [ "${FORCE}" != "Y" ]
|
|
|
0d6b98 |
then
|
|
|
0d6b98 |
- echo "\n${LIST}"
|
|
|
0d6b98 |
- echo "Update the library? <(Y)es, (N)o, (Q)uit> [n] \c"
|
|
|
0d6b98 |
+ printf "\n${LIST}\n"
|
|
|
0d6b98 |
+ printf "Update the library? <(Y)es, (N)o, (Q)uit> [n] "
|
|
|
0d6b98 |
read x y
|
|
|
0d6b98 |
case $x in
|
|
|
0d6b98 |
[Yy]* ) ;;
|
|
|
0d6b98 |
@@ -176,9 +176,9 @@ create_list()
|
|
|
0d6b98 |
*) return ;;
|
|
|
0d6b98 |
esac
|
|
|
0d6b98 |
fi
|
|
|
0d6b98 |
- echo "Updating library:\n ${LIST} \c"
|
|
|
0d6b98 |
+ printf "Updating library:\n ${LIST} "
|
|
|
0d6b98 |
else
|
|
|
0d6b98 |
- echo "Creating library:\n ${LIST} \c"
|
|
|
0d6b98 |
+ printf "Creating library:\n ${LIST} "
|
|
|
0d6b98 |
fi
|
|
|
0d6b98 |
|
|
|
0d6b98 |
(
|
|
|
0d6b98 |
@@ -196,7 +196,7 @@ create_list()
|
|
|
0d6b98 |
-print
|
|
|
0d6b98 |
) | grep -v SCCS | sort -u > ${LIST}
|
|
|
0d6b98 |
|
|
|
0d6b98 |
- echo "\n`cat ${LIST} | wc -l` files listed"
|
|
|
0d6b98 |
+ printf "\n`cat ${LIST} | wc -l` files listed\n"
|
|
|
0d6b98 |
}
|
|
|
0d6b98 |
|
|
|
0d6b98 |
#
|
|
|
0d6b98 |
@@ -210,7 +210,7 @@ exp_inc()
|
|
|
0d6b98 |
then
|
|
|
0d6b98 |
for i in `cat ${theInc}`
|
|
|
0d6b98 |
do
|
|
|
0d6b98 |
- echo "-I $i \c"
|
|
|
0d6b98 |
+ printf "-I $i "
|
|
|
0d6b98 |
done
|
|
|
0d6b98 |
fi
|
|
|
0d6b98 |
}
|
|
|
0d6b98 |
@@ -285,7 +285,7 @@ std_libs ${SYSDIR}$PWD
|
|
|
0d6b98 |
|
|
|
0d6b98 |
DIR=$PWD
|
|
|
0d6b98 |
if [ ! -n "${NOUPDATE}" -o -n "${SPECDEST}" ] ; then
|
|
|
0d6b98 |
-echo "Create new library? <(L)ocal, (H)ome, (S)ystem, (Q)uit> [q] \c"
|
|
|
0d6b98 |
+ printf "Create new library? <(L)ocal, (H)ome, (S)ystem, (Q)uit> [q] "
|
|
|
0d6b98 |
|
|
|
0d6b98 |
# shellcheck disable=SC2034
|
|
|
0d6b98 |
read x y
|
|
|
0d6b98 |
--
|
|
|
0d6b98 |
2.26.2
|
|
|
0d6b98 |
|