From d4198bde246e8563a69c209646b249189cc8484d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 5 Sep 2014 19:00:06 +0200 Subject: [PATCH] Replace backticks with $() It seems this is generally preferred in shell code to what I heard from reviewers. Change-Id: If61813bd3c4bc61d0282232c99f8011e776eba8b --- lib/img-functions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/img-functions b/lib/img-functions index 3a89ddbcc..c65742f38 100644 --- a/lib/img-functions +++ b/lib/img-functions @@ -138,8 +138,8 @@ function select_boot_kernel_initrd () { TARGET_ROOT=$1 BOOTDIR=$TARGET_ROOT/boot if [ -n "${DIB_BAREMETAL_KERNEL_PATTERN:-}" -a -n "${DIB_BAREMETAL_INITRD_PATTERN:-}" ]; then - KERNEL=$(basename `eval ls -1rv "$BOOTDIR/${DIB_BAREMETAL_KERNEL_PATTERN}" | head -1`) - RAMDISK=$(basename `eval ls -1rv "$BOOTDIR/${DIB_BAREMETAL_INITRD_PATTERN}" | head -1`) + KERNEL=$(basename $(eval ls -1rv "$BOOTDIR/${DIB_BAREMETAL_KERNEL_PATTERN}" | head -1)) + RAMDISK=$(basename $(eval ls -1rv "$BOOTDIR/${DIB_BAREMETAL_INITRD_PATTERN}" | head -1)) elif [ -f $TARGET_ROOT/etc/redhat-release ]; then # Prioritize PAE if present @@ -152,17 +152,17 @@ function select_boot_kernel_initrd () { KERNEL=$(basename $KERNEL) KERNEL_VERSION=${KERNEL#vmlinuz-} - RAMDISK=$(basename `ls $BOOTDIR/initramfs-$KERNEL_VERSION.img` || echo "") + RAMDISK=$(basename $(ls $BOOTDIR/initramfs-$KERNEL_VERSION.img) || echo "") if [ ! $RAMDISK ]; then echo "Can't find an initramfs for the $KERNEL_VERSION version of the kernel." exit 1 fi elif [ -f $TARGET_ROOT/etc/debian_version ]; then - KERNEL=$(basename `ls -1rv $BOOTDIR/vmlinuz*generic | head -1`) - RAMDISK=$(basename `ls -1rv $BOOTDIR/initrd*generic | head -1`) + KERNEL=$(basename $(ls -1rv $BOOTDIR/vmlinuz*generic | head -1)) + RAMDISK=$(basename $(ls -1rv $BOOTDIR/initrd*generic | head -1)) # in case files with "generic" suffix were not found, fall back to default - KERNEL=${KERNEL:-$(basename `ls -1rv $BOOTDIR/vmlinuz* | head -1`)} - RAMDISK=${RAMDISK:-$(basename `ls -1rv $BOOTDIR/initrd* | head -1`)} + KERNEL=${KERNEL:-$(basename $(ls -1rv $BOOTDIR/vmlinuz* | head -1))} + RAMDISK=${RAMDISK:-$(basename $(ls -1rv $BOOTDIR/initrd* | head -1))} elif [ -f $TARGET_ROOT/etc/SuSE-release ]; then KERNEL=$(basename $(readlink -e $BOOTDIR/vmlinuz)) RAMDISK=$(basename $(readlink -e $BOOTDIR/initrd))