From 54e006d2672914418ed92dbeb2f10aa9edc84b0e Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 16 Jan 2016 21:46:27 -0500 Subject: cmd/*: Reduce block_umount() calls to one-liners --- (limited to 'src/cmd') diff --git a/src/cmd/build.sh b/src/cmd/build.sh index 6b85fad..dbfd910 100644 --- a/src/cmd/build.sh +++ b/src/cmd/build.sh @@ -93,9 +93,7 @@ cmd_build_main() session_end - if [ "x${dev}" != 'x' ]; then - block_umount "${root}" - fi + [ "x${dev}" != 'x' ] && block_umount "${root}" } cmd_build_make_deps_pkg() diff --git a/src/cmd/install.sh b/src/cmd/install.sh index dcbb3ff..9c1bf46 100644 --- a/src/cmd/install.sh +++ b/src/cmd/install.sh @@ -69,9 +69,7 @@ cmd_install_main() "${cmd_install_opt_a-}" "${cmd_install_opt_p-}" \ "${chroot}" "${foreign}" - if [ "x${dev}" != 'x' ]; then - block_umount "${chroot}" - fi + [ "x${dev}" != 'x' ] && block_umount "${chroot}" } cmd_install_register() diff --git a/src/cmd/opkg.sh b/src/cmd/opkg.sh index 218fb2d..5a48fb8 100644 --- a/src/cmd/opkg.sh +++ b/src/cmd/opkg.sh @@ -87,9 +87,7 @@ cmd_opkg_main() cmd_opkg_fini session_end - if [ "x${dev}" != 'x' ]; then - block_umount "${root}" - fi + [ "x${dev}" != 'x' ] && block_umount "${root}" } cmd_opkg_fini() diff --git a/src/cmd/shell.sh b/src/cmd/shell.sh index f062a0e..e761f55 100644 --- a/src/cmd/shell.sh +++ b/src/cmd/shell.sh @@ -49,9 +49,7 @@ cmd_shell_main() fi session_end - if [ "x${dev}" != 'x' ]; then - block_umount "${root}" - fi + [ "x${dev}" != 'x' ] && block_umount "${root}" } cmd_shell_register() -- cgit v0.9.1