Skip to content

Commit 5b74437

Browse files
committed
detect-environment: Put ;; on separate line
Put the pattern block terminators on separate lines, in the detect_arch function, for the sake of consistency. Ticket: ENT-12600 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent 2ce9b3e commit 5b74437

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

build-scripts/detect-environment

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,40 +274,52 @@ detect_arch()
274274
{
275275
case "$DEP_PACKAGING" in
276276
deb)
277-
ARCH=$(dpkg --print-architecture);;
277+
ARCH=$(dpkg --print-architecture)
278+
;;
278279
rpm)
279-
ARCH=$(rpm --eval '%{_arch}');;
280+
ARCH=$(rpm --eval '%{_arch}')
281+
;;
280282
solaris)
281283
case $UNAME_M in
282284
sun*)
283-
ARCH=sparc;;
285+
ARCH=sparc
286+
;;
284287
i86pc)
285-
ARCH=i86pc;;
288+
ARCH=i86pc
289+
;;
286290
*)
287-
echo "Unknown Solaris architecture: $UNAME_M";;
288-
esac;;
291+
echo "Unknown Solaris architecture: $UNAME_M"
292+
;;
293+
esac
294+
;;
289295

290296
freebsd)
291297
ARCH=$UNAME_M
292-
OS_VERSION=$UNAME_R ;;
298+
OS_VERSION=$UNAME_R
299+
;;
293300
hpux)
294301
ARCH=$UNAME_M
295-
OS_VERSION=$UNAME_R ;;
302+
OS_VERSION=$UNAME_R
303+
;;
296304
*)
297305
echo "Unknown packaging system"
298-
exit 42;;
306+
exit 42
307+
;;
299308
esac
300309

301310
case "$CROSS_TARGET" in
302311
'')
303312
;;
304313
x86-*)
305-
ARCH=x86;;
314+
ARCH=x86
315+
;;
306316
x64-*)
307-
ARCH=x64;;
317+
ARCH=x64
318+
;;
308319
*)
309320
echo "Unknown cross-compilation target: $CROSS_TARGET"
310-
exit 42;;
321+
exit 42
322+
;;
311323
esac
312324

313325
export ARCH

0 commit comments

Comments
 (0)