1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Subject: [MAKEFLOPPIES] Remove XSIisms and replace use of /bin/bash with /bin/sh
Author: David Weinehall <tao@acc.umu.se>
Bug-Debian: http://bugs.debian.org/254933
Last-Update: 2010-05-12
--- a/src/MAKEFLOPPIES
+++ b/src/MAKEFLOPPIES
@@ -47,7 +47,7 @@
{ if [ $# -lt 1 ]; then
return
fi
- if [ "$1" -lt 1 -o "$1" -ge $# ]; then
+ if [ "$1" -lt 1 ] || [ "$1" -ge $# ]; then
return
fi
shift $1
@@ -101,7 +101,7 @@
# main()
PERMISSION=666
-while [ $# -ge 1 -o -n "${REMAINDER}" ]; do
+while [ $# -ge 1 ] || [ -n "${REMAINDER}" ]; do
if [ -n "$REMAINDER" ]; then
## Continue processing options stuck together
ARG=$REMAINDER
@@ -203,13 +203,13 @@
fi
FORMATS=`getword "$CMOS" $CMOSFORMATS`
- if [ -n "$VERBOSE" -o -n "$DRYRUN" ]; then
+ if [ -n "$VERBOSE" ] || [ -n "$DRYRUN" ]; then
echo rm -f "$FILE"*
fi
if [ -z "$DRYRUN" ]; then
rm -f "$FILE"*
fi
- if [ -z "$CMOS" -o -z "$CN" ]; then
+ if [ -z "$CMOS" ] || [ -z "$CN" ]; then
echo "Skipping invalid drive \"$FILE\"" >&2
continue
fi
@@ -219,7 +219,7 @@
chown root:floppy "$FILE"
chmod ${PERMISSION} "$FILE"
fi
- if [ -n "$VERBOSE" -o -n "$DRYRUN" ]; then
+ if [ -n "$VERBOSE" ] || [ -n "$DRYRUN" ]; then
echo mknod "$FILE" b "$MAJOR" "$BASENUMBER"
fi
@@ -243,7 +243,7 @@
chown root:floppy "${FILE}${NAME}"
chmod ${PERMISSION} "${FILE}${NAME}"
fi
- if [ -n "$VERBOSE" -o -n "$DRYRUN" ]; then
+ if [ -n "$VERBOSE" ] || [ -n "$DRYRUN" ]; then
echo mknod "${FILE}${NAME}" b "$MAJOR" "$MINOR"
fi
fi
|
