@matheusbsbs / matheus-bagliano / commits / 8096fae726
Fork 0

Fix expr usage for FreeBSD

Some implementations of "expr" (e.g. FreeBSD's) fail, if an argument starts with a dash. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Dennis Stosberg committed Jun 27, 2006 at 18:54 UTC 8096fae7269e7b3882394100151bc017446b01a1
7 files changed +16 -16
git-am.sh
+1 -1
@@ -97,7 +97,7 @@ while case "$#" in 0) break;; esac
97 do
98 case "$1" in
99 -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
100 - dotest=`expr "$1" : '-[^=]*=\(.*\)'`; shift ;;
100 + dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
101 -d|--d|--do|--dot|--dote|--dotes|--dotest)
102 case "$#" in 1) usage ;; esac; shift
103 dotest="$1"; shift;;
git-clone.sh
+1 -1
@@ -133,7 +133,7 @@ while
133 *,--reference)
134 shift; reference="$1" ;;
135 *,--reference=*)
136 - reference=`expr "$1" : '--reference=\(.*\)'` ;;
136 + reference=`expr "z$1" : 'z--reference=\(.*\)'` ;;
137 *,-o|*,--or|*,--ori|*,--orig|*,--origi|*,--origin)
138 case "$2" in
139 '')
git-commit.sh
+9 -9
@@ -223,13 +223,13 @@ do
223 -F*|-f*)
224 no_edit=t
225 log_given=t$log_given
226 - logfile=`expr "$1" : '-[Ff]\(.*\)'`
226 + logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
227 shift
228 ;;
229 --F=*|--f=*|--fi=*|--fil=*|--file=*)
230 no_edit=t
231 log_given=t$log_given
232 - logfile=`expr "$1" : '-[^=]*=\(.*\)'`
232 + logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
233 shift
234 ;;
235 -a|--a|--al|--all)
@@ -237,7 +237,7 @@ do
237 shift
238 ;;
239 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
240 - force_author=`expr "$1" : '-[^=]*=\(.*\)'`
240 + force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
241 shift
242 ;;
243 --au|--aut|--auth|--autho|--author)
@@ -277,11 +277,11 @@ $1"
277 log_given=m$log_given
278 if test "$log_message" = ''
279 then
280 - log_message=`expr "$1" : '-m\(.*\)'`
280 + log_message=`expr "z$1" : 'z-m\(.*\)'`
281 else
282 log_message="$log_message
283
284 -`expr "$1" : '-m\(.*\)'`"
284 +`expr "z$1" : 'z-m\(.*\)'`"
285 fi
286 no_edit=t
287 shift
@@ -290,11 +290,11 @@ $1"
290 log_given=m$log_given
291 if test "$log_message" = ''
292 then
293 - log_message=`expr "$1" : '-[^=]*=\(.*\)'`
293 + log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
294 else
295 log_message="$log_message
296
297 -`expr "$1" : '-[^=]*=\(.*\)'`"
297 +`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
298 fi
299 no_edit=t
300 shift
@@ -321,7 +321,7 @@ $1"
321 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
322 --reedit-messag=*|--reedit-message=*)
323 log_given=t$log_given
324 - use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
324 + use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
325 no_edit=
326 shift
327 ;;
@@ -346,7 +346,7 @@ $1"
346 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
347 --reuse-message=*)
348 log_given=t$log_given
349 - use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
349 + use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
350 no_edit=t
351 shift
352 ;;
git-merge.sh
+1 -1
@@ -103,7 +103,7 @@ do
103 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
104 case "$#,$1" in
105 *,*=*)
106 - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
106 + strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
107 1,*)
108 usage ;;
109 *)
git-pull.sh
+1 -1
@@ -24,7 +24,7 @@ do
24 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
25 case "$#,$1" in
26 *,*=*)
27 - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
27 + strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
28 1,*)
29 usage ;;
30 *)
git-quiltimport.sh
+2 -2
@@ -9,7 +9,7 @@ while case "$#" in 0) break;; esac
9 do
10 case "$1" in
11 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
12 - quilt_author=$(expr "$1" : '-[^=]*\(.*\)')
12 + quilt_author=$(expr "z$1" : 'z-[^=]*\(.*\)')
13 shift
14 ;;
15
@@ -26,7 +26,7 @@ do
26 ;;
27
28 --pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
29 - QUILT_PATCHES=$(expr "$1" : '-[^=]*\(.*\)')
29 + QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
30 shift
31 ;;
32
git-rebase.sh
+1 -1
@@ -179,7 +179,7 @@ do
179 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
180 case "$#,$1" in
181 *,*=*)
182 - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
182 + strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
183 1,*)
184 usage ;;
185 *)