From f92868bd30bcd8484c7eaffbce647e9915726010 Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 20 May 2020 13:00:00 -0500 Subject: [PATCH] scripts: fix shellcheck SC2006 'Use $(...) notation instead of legacy backticked `...`.' --- scripts/buildFilesystem.sh | 2 +- scripts/buildInitramFs.sh | 4 ++-- scripts/buildKernel.sh | 4 ++-- scripts/crossmenuconfig.sh | 2 +- scripts/injectKernelIntoFS.sh | 2 +- scripts/patchKernel.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index bbebc67..f7b0996 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -56,7 +56,7 @@ DEBIAN_SUITE=$2 BASE=$3 PRAWNOS_ROOT=$4 -outmnt=$(mktemp -d -p `pwd`) +outmnt=$(mktemp -d -p "$(pwd)") outdev=/dev/loop5 diff --git a/scripts/buildInitramFs.sh b/scripts/buildInitramFs.sh index 14d6c6e..474428e 100755 --- a/scripts/buildInitramFs.sh +++ b/scripts/buildInitramFs.sh @@ -22,7 +22,7 @@ set -e # along with PrawnOS. If not, see . -outmnt=$(mktemp -d -p `pwd`) +outmnt=$(mktemp -d -p "$(pwd)") outdev=/dev/loop7 if [ -z "$1" ] then @@ -30,7 +30,7 @@ then exit 1 fi BASE=$1 -ROOT_DIR=`pwd` +ROOT_DIR="$(pwd)" build_resources=$ROOT_DIR/resources/BuildResources if [ ! -f $ROOT_DIR/$BASE ] diff --git a/scripts/buildKernel.sh b/scripts/buildKernel.sh index f192076..68529f1 100755 --- a/scripts/buildKernel.sh +++ b/scripts/buildKernel.sh @@ -28,7 +28,7 @@ then fi KVER=$1 -ROOT_DIR=`pwd` +ROOT_DIR="$(pwd)" RESOURCES=$ROOT_DIR/resources/BuildResources [ ! -d build ] && mkdir build @@ -66,7 +66,7 @@ make mrproper #copy in the initramfs and kernel config cp $ROOT_DIR/build/PrawnOS-initramfs.cpio.gz . cp $RESOURCES/config .config -make -j $((`nproc` +1)) CROSS_COMPILE=arm-none-eabi- ARCH=arm zImage modules dtbs +make -j $(($(nproc) +1)) CROSS_COMPILE=arm-none-eabi- ARCH=arm zImage modules dtbs [ ! -h kernel.its ] && ln -s $RESOURCES/kernel.its . mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg dd if=/dev/zero of=bootloader.bin bs=512 count=1 diff --git a/scripts/crossmenuconfig.sh b/scripts/crossmenuconfig.sh index 3f4e56f..087d91f 100755 --- a/scripts/crossmenuconfig.sh +++ b/scripts/crossmenuconfig.sh @@ -30,7 +30,7 @@ fi KVER=$1 -ROOT_DIR=`pwd` +ROOT_DIR="$(pwd)" RESOURCES=$ROOT_DIR/resources/BuildResources [ ! -d build ] && mkdir build diff --git a/scripts/injectKernelIntoFS.sh b/scripts/injectKernelIntoFS.sh index d98ac38..e090452 100755 --- a/scripts/injectKernelIntoFS.sh +++ b/scripts/injectKernelIntoFS.sh @@ -32,7 +32,7 @@ fi KVER=$1 OUTNAME=$2 -outmnt=$(mktemp -d -p `pwd`) +outmnt=$(mktemp -d -p "$(pwd)") outdev=/dev/loop7 build_resources=resources/BuildResources diff --git a/scripts/patchKernel.sh b/scripts/patchKernel.sh index 8850daa..eb21684 100755 --- a/scripts/patchKernel.sh +++ b/scripts/patchKernel.sh @@ -10,7 +10,7 @@ then fi KVER=$1 -ROOT_DIR=`pwd` +ROOT_DIR="$(pwd)" RESOURCES=$ROOT_DIR/resources/BuildResources