diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/architectures.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 6 | ||||
| -rwxr-xr-x | functions/losetup.sh | 2 | ||||
| -rwxr-xr-x | functions/man.sh | 2 | ||||
| -rwxr-xr-x | functions/packages.sh | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/functions/architectures.sh b/functions/architectures.sh index aeb298eb3..bdad4cbc0 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -50,7 +50,7 @@ Check_architectures () Check_crossarchitectures () { - if [ $(which dpkg) ] + if command -v dpkg >/dev/null then HOST="$(dpkg --print-architecture)" else diff --git a/functions/defaults.sh b/functions/defaults.sh index 695195d9d..14dd5d269 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -14,7 +14,7 @@ New_configuration () ## Runtime # Image: Architecture - if [ $(which dpkg) ] + if command -v dpkg >/dev/null then CURRENT_IMAGE_ARCHITECTURE="$(dpkg --print-architecture)" else @@ -94,7 +94,7 @@ Set_config_defaults () LB_SYSTEM="${LB_SYSTEM:-live}" # Setting mode (currently: debian, progress-linux) - if [ $(which lsb_release) ] + if command -v lsb_release >/dev/null then _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" @@ -802,7 +802,7 @@ Check_config_defaults () { case "${LB_BINARY_FILESYSTEM}" in ntfs) - if [ ! $(which ntfs-3g) ] + if ! command -v ntfs-3g >/dev/null then Echo_error "Using ntfs as the binary filesystem is currently only supported if ntfs-3g is installed on the host system." diff --git a/functions/losetup.sh b/functions/losetup.sh index c3dd59641..971054284 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -22,7 +22,7 @@ Lodetach () # Changes to block devices result in uevents which trigger rules which in # turn access the loop device (ex. udisks-part-id, blkid) which can cause # a race condition. We call 'udevadm settle' to help avoid this. - if [ $(which udevadm) ] + if command -v udevadm >/dev/null then udevadm settle fi diff --git a/functions/man.sh b/functions/man.sh index cb886fba1..9eeb7206f 100755 --- a/functions/man.sh +++ b/functions/man.sh @@ -11,7 +11,7 @@ Man () { - if [ $(which man) ] + if command -v man >/dev/null then man $(basename ${0}) exit 0 diff --git a/functions/packages.sh b/functions/packages.sh index f07bed35f..edf6f87b2 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -81,7 +81,7 @@ Check_installed () INSTALL_STATUS=1 fi else - if [ $(which dpkg-query) ] + if command -v dpkg-query >/dev/null then if dpkg-query -s "${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then |