Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-12-29 03:48:29 UTC
Modified files:
ChangeLog ircd-patch
Log message:
Fix portability problems in ircd-patch script.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.756 ircu2.10/ChangeLog:1.757
--- ircu2.10/ChangeLog:1.756 Fri Dec 23 09:42:27 2005
+++ ircu2.10/ChangeLog Wed Dec 28 19:48:19 2005
@@ -1,3 +1,8 @@
+2005-12-28 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd-patch: Do not use [ for test, and do not use $[] for expr.
+ (Solaris /bin/sh, among others, have problems with those.)
+
2005-12-23 Michael Poole <[EMAIL PROTECTED]>
* config.guess: Update to current version.
Index: ircu2.10/ircd-patch
diff -u ircu2.10/ircd-patch:1.5 ircu2.10/ircd-patch:1.6
--- ircu2.10/ircd-patch:1.5 Fri Apr 12 06:00:35 2002
+++ ircu2.10/ircd-patch Wed Dec 28 19:48:19 2005
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id: ircd-patch,v 1.5 2002/04/12 13:00:35 vampire Exp $
+# $Id: ircd-patch,v 1.6 2005/12/29 03:48:19 entrope Exp $
#
#
# Experimental centralized patch system for ircu
@@ -48,15 +48,15 @@
update_patchlist() {
list=""
for name in $PLIST ; do
- [ -f $MARKS/$name ] && list="$list.$name"
+ test -f $MARKS/$name && list="$list.$name"
done
echo "/* This file was automatically generated by ircd-patch */" >
$PLIST_FILE
echo "#define PATCHLIST \"$list\"" >> $PLIST_FILE
echo "Updated $PLIST_FILE"
}
-[ ! -d $DIFFS ] && (echo "*** Missing $DIFFS, creating it" ; mkdir -p $DIFFS)
-[ ! -d $MARKS ] && (echo "*** Missing $MARKS, creating it" ; mkdir -p $MARKS)
+test -d $DIFFS || (echo "*** Missing $DIFFS, creating it" ; mkdir -p $DIFFS)
+test -d $MARKS || (echo "*** Missing $MARKS, creating it" ; mkdir -p $MARKS)
dry_run() {
rejects=`patch -p0 -N -t --dry-run $2 < $1 | grep "hunk FAILED" | sed
-e 's/.*to file / /;s/\.rej$//'`
@@ -66,7 +66,7 @@
patch_list() {
echo "Available patches (* marks applied patches):"
for name in $PLIST ; do
- [ -f $MARKS/$name ] && echo -n " * " || echo -n " "
+ test -f $MARKS/$name && echo -n " * " || echo -n " "
echo $name
done
echo "Done."
@@ -75,11 +75,11 @@
patch_test() {
echo "Testing patches:"
list="$*"
- [ -z "$list" ] && list=$PLIST
+ test "z$list" = "z" && list=$PLIST
for name in $list ; do
fname=$DIFFS/$name.diff
echo -ne " $name\t"
- if [ ! -f $MARKS/$name ] ; then
+ if test ! -f $MARKS/$name ; then
if dry_run "$fname" ; then
echo -n " OK"
else
@@ -103,19 +103,19 @@
patch_add() {
name=$1
fname="$DIFFS/$name.diff"
- if [ ! -f $fname ]; then
+ if test ! -f $fname ; then
echo "Patch $name ($fname) does not exist"
retcode=3
return
fi
- if [ $force -lt 2 -a -f $MARKS/$name ] ; then
+ if test $force -lt 2 -a -f $MARKS/$name ; then
echo "Patch $name seems already applied"
retcode=4
return
fi
- if [ $force -lt 1 ]; then
+ if test $force -lt 1 ; then
echo -n "Testing $fname... "
if ! dry_run $fname ; then
echo "Failed (use -f to force)."
@@ -140,19 +140,19 @@
patch_del() {
name=$1
fname="$DIFFS/$name.diff"
- if [ ! -f $fname ]; then
+ if test ! -f $fname ; then
echo "Patch $name ($fname) does not exist"
retcode=3
return
fi
- if [ $force -lt 2 -a ! -f $MARKS/$name ] ; then
+ if test $force -lt 2 -a ! -f $MARKS/$name ; then
echo "Patch $name doesn't seem to be applied"
retcode=4
return
fi
- if [ $force -lt 1 ]; then
+ if test $force -lt 1 ; then
echo -n "Testing $fname... "
if ! dry_run $fname -R ; then
echo "Failed (use -f to force)."
@@ -188,8 +188,8 @@
echo "a patch is already applied."
}
-while [ "$1" == "-f" ]; do
- force=$[$force + 1]
+while test "$1" = "-f" ; do
+ force=`expr $force + 1`
shift
done
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
