diff options
| -rwxr-xr-x | frontend/lb | 4 | ||||
| -rwxr-xr-x | frontend/live-build | 2 | ||||
| -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 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 2 | ||||
| -rwxr-xr-x | share/bin/Packages | 2 | ||||
| -rwxr-xr-x | share/hooks/normal/0400-update-apt-file-cache.hook.chroot | 2 | ||||
| -rwxr-xr-x | share/hooks/normal/0410-update-apt-xapian-index.hook.chroot | 2 | ||||
| -rwxr-xr-x | share/hooks/normal/0430-update-mlocate-database.hook.chroot | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/frontend/lb b/frontend/lb index 993d3a27d..464b07dcc 100755 --- a/frontend/lb +++ b/frontend/lb @@ -21,7 +21,7 @@ USAGE="lb {clean|config|build}" case "${1}" in -h|--help) - if command -v man >/dev/null + if [ $(which man) ] then man lb exit 0 @@ -76,7 +76,7 @@ case "${1}" in then # User has live-build installed in the system SCRIPT=/usr/lib/live/build/"${COMMAND}" - elif command -v "${COMMAND}" >/dev/null + elif [ $(which "${COMMAND}") ] then # User has live-build commands in path SCRIPT="${COMMAND}" diff --git a/frontend/live-build b/frontend/live-build index 2980158c0..29efec9cf 100755 --- a/frontend/live-build +++ b/frontend/live-build @@ -23,7 +23,7 @@ set -e -if command -v man >/dev/null +if [ $(which man) ] then man live-build else diff --git a/functions/architectures.sh b/functions/architectures.sh index bdad4cbc0..aeb298eb3 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -50,7 +50,7 @@ Check_architectures () Check_crossarchitectures () { - if command -v dpkg >/dev/null + if [ $(which dpkg) ] then HOST="$(dpkg --print-architecture)" else diff --git a/functions/defaults.sh b/functions/defaults.sh index 14dd5d269..695195d9d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -14,7 +14,7 @@ New_configuration () ## Runtime # Image: Architecture - if command -v dpkg >/dev/null + if [ $(which dpkg) ] 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 command -v lsb_release >/dev/null + if [ $(which lsb_release) ] then _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" @@ -802,7 +802,7 @@ Check_config_defaults () { case "${LB_BINARY_FILESYSTEM}" in ntfs) - if ! command -v ntfs-3g >/dev/null + if [ ! $(which ntfs-3g) ] 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 971054284..c3dd59641 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 command -v udevadm >/dev/null + if [ $(which udevadm) ] then udevadm settle fi diff --git a/functions/man.sh b/functions/man.sh index 9eeb7206f..cb886fba1 100755 --- a/functions/man.sh +++ b/functions/man.sh @@ -11,7 +11,7 @@ Man () { - if command -v man >/dev/null + if [ $(which man) ] then man $(basename ${0}) exit 0 diff --git a/functions/packages.sh b/functions/packages.sh index edf6f87b2..f07bed35f 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -81,7 +81,7 @@ Check_installed () INSTALL_STATUS=1 fi else - if command -v dpkg-query >/dev/null + if [ $(which dpkg-query) ] then if dpkg-query -s "${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index d1fe54365..c25cbacec 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]" # Processing arguments and configuration files Init_config_data "${@}" -if ! command -v debootstrap >/dev/null +if [ ! $(which debootstrap) ] then Echo_error "debootstrap - command not found" Echo_verbose "debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/" diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 612f8f74a..b602caf4b 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -238,7 +238,7 @@ case "${1}" in cp -f cache/indices.bootstrap/*Release* chroot/var/lib/apt/lists fi - if [ "${LB_APT}" = "aptitude" ] && ! command -v aptitude >/dev/null + if [ "${LB_APT}" = "aptitude" ] && [ ! $(which aptitude) ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" diff --git a/scripts/build/config b/scripts/build/config index 943ca7c00..0f84c28c7 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -182,7 +182,7 @@ Local_arguments () case "${1}" in --dump) # Dump version - if command -v dpkg-query >/dev/null + if [ $(which dpkg-query) ] then VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-build)" fi diff --git a/share/bin/Packages b/share/bin/Packages index 60cd999fc..ad69fad83 100755 --- a/share/bin/Packages +++ b/share/bin/Packages @@ -11,7 +11,7 @@ set -e -if ! command -v grep-aptavail >/dev/null +if [ ! $(which grep-aptavail) ] then echo "E: program grep-aptavail not found!" diff --git a/share/hooks/normal/0400-update-apt-file-cache.hook.chroot b/share/hooks/normal/0400-update-apt-file-cache.hook.chroot index c83225fe5..4634d4cf8 100755 --- a/share/hooks/normal/0400-update-apt-file-cache.hook.chroot +++ b/share/hooks/normal/0400-update-apt-file-cache.hook.chroot @@ -8,7 +8,7 @@ set -e . /live-build/config/binary -if command -v apt-file >/dev/null && [ "${LB_APT_INDICES}" = "true" ] +if [ $(which apt-file) ] && [ "${LB_APT_INDICES}" = "true" ] then apt-file update fi diff --git a/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot b/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot index f737ad171..93801e511 100755 --- a/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot +++ b/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot @@ -8,7 +8,7 @@ set -e # is not allowed to, and (b) it wants to build the index in the background which # will be racy in the context of live-build. -if command -v update-apt-xapian-index >/dev/null +if [ $(which update-apt-xapian-index) ] then PYTHONDONTWRITEBYTECODE=1 update-apt-xapian-index --force --quiet fi diff --git a/share/hooks/normal/0430-update-mlocate-database.hook.chroot b/share/hooks/normal/0430-update-mlocate-database.hook.chroot index 03502fdeb..df99386fe 100755 --- a/share/hooks/normal/0430-update-mlocate-database.hook.chroot +++ b/share/hooks/normal/0430-update-mlocate-database.hook.chroot @@ -8,7 +8,7 @@ set -e # means that if the live system is later installed to a hard disk then less # work will be required after installation. -if command -v updatedb.mlocate >/dev/null +if [ $(which updatedb.mlocate) ] then updatedb.mlocate fi |