From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oKDHR-0003v8-3Z for mharc-grub-devel@gnu.org; Sat, 06 Aug 2022 02:27:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKDHO-0003uz-Ts for grub-devel@gnu.org; Sat, 06 Aug 2022 02:27:22 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:41935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKDHM-0002DE-Ny for grub-devel@gnu.org; Sat, 06 Aug 2022 02:27:22 -0400 Received: by mail-qt1-x835.google.com with SMTP id d16so3423988qtw.8 for ; Fri, 05 Aug 2022 23:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=WrOeV5BkKy1IGNMpvcDV969GKOKf08mt524KUw70Upw=; b=kM2cqQpAXaukp+pQmHcOx9L0c4E0m7RVyZTyj9EN7opu7yZos8gwHBcF2AAVGgkFe9 AWaybQoiLVpjcb7+SmLmCRGFAt6BrO23p2igQhCp25Lw6avTv0rGfoqyktyK1UA6ff2c lCuCxju6cuomVo61Ez/OXDZHoU/wyvKnKjK6Iea0axzwmb3/9PxERKVKRj6EYAPqFOZ2 vuNkI/kEuP0DCyEre+TwaZDXTf6vuznoI8jKCLEmo9Q9BIdYWb+ZvM7xBb5DaiitYFNO BpCgGhoHpbn8n9b8tFo1PoLmGf2xGjsbyQqjZOnh2ePKpzPI+W7SRg9QBSSB0/shaK5I M0Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=WrOeV5BkKy1IGNMpvcDV969GKOKf08mt524KUw70Upw=; b=xH3156gA0daW5Ee4ipgRnDtWq00/XfZw+vCpNEpRnUFBeDE84eGY6UG85u+84hruZD 11eAEcPeydDq5OUf6l7VfJ7y4Q3Uvmhe9nmC1QkjxeeGCDZUJ5Vx7oe/Ckt2Q435oVnk e4xB+Iy27Bcpw/mdMSg5DrTVCzyKR7OeVuGIMaQTQYrgGP06/sesr+JGUm2krTmIPugv p9RrjakN0gzBcJofI13UNTDD+4oJBnxhYPhjIh0379ef8Xdbtyk11H3WPNEwyhheb/ch WBtgpvtV6ROLmRMruPK4KaUf2aiypxuCY9IdHxJi2Snv2/NsoFnPGTDSJtx4Im9A7+6j CgEQ== X-Gm-Message-State: ACgBeo3xKQS+nGjpCjrPl2ZLdCfHL6nImBYFUR6blJB7jzgVvQzYzGJB TOz7nsR0Jf4Sxf4j4bJ7/TVD/64qHXt37Q== X-Google-Smtp-Source: AA6agR6H7HQNddxXXHAg1c6eT5/HV4mGi1J1uKToq6+X/qXML5uEYs1mNnIdmH7CSN4wNhAHGu/EHw== X-Received: by 2002:ac8:5cc3:0:b0:31f:782:8588 with SMTP id s3-20020ac85cc3000000b0031f07828588mr8854710qta.594.1659767238659; Fri, 05 Aug 2022 23:27:18 -0700 (PDT) Received: from localhost.localdomain ([185.220.103.12]) by smtp.gmail.com with ESMTPSA id w2-20020ac84d02000000b0031edab8ae91sm3855011qtv.49.2022.08.05.23.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 23:27:18 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Daniel Kiper , Glenn Washburn Subject: [PATCH] grub-shell: Use shell variable instead of autoconf Date: Sat, 6 Aug 2022 01:26:31 -0500 Message-Id: <20220806062631.1679392-1-development@efficientek.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::835; envelope-from=development@efficientek.com; helo=mail-qt1-x835.google.com X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2022 06:27:23 -0000 By using shell variable that are set once by the expansion of an autoconf variable, the resulting shell script is more easily moved and modified from the build/install directory it was generated for. The resulting script is more readable as well. Signed-off-by: Glenn Washburn --- tests/util/grub-shell.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index 4828afb7c..bb7b285e9 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -384,10 +384,10 @@ if test -z "$debug"; then fi if [ x$boot != xnet ] && [ x$boot != xemu ]; then - pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \ + pkgdatadir="${builddir}" "${builddir}/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \ --rom-directory="${rom_directory}" \ - --locale-directory="@srcdir@/po" \ - --themes-directory="@srcdir@/themes" \ + --locale-directory="${srcdir}/po" \ + --themes-directory="${srcdir}/themes" \ $mkimage_extra_arg ${mkrescue_args} \ "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \ ${files} >/dev/null 2>&1 @@ -482,7 +482,7 @@ copy_extra_files() { if [ x$boot = xnet ]; then netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 - pkgdatadir="@builddir@" "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--directory=${builddir}/grub-core" "--net-directory=$netdir" ${mkrescue_args} > /dev/null + pkgdatadir="${builddir}" "${builddir}/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--directory=${builddir}/grub-core" "--net-directory=$netdir" ${mkrescue_args} > /dev/null cp "${cfgfile}" "$netdir/boot/grub/grub.cfg" cp "${source}" "$netdir/boot/grub/testcase.cfg" [ -z "$files" ] || copy_extra_files "$netdir" $files @@ -493,9 +493,9 @@ elif [ x$boot = xemu ]; then mkdir -p "$grubdir/fonts" mkdir -p "$grubdir/themes" mkdir -p "$grubdir/locale" - test -f "@builddir@/"unicode.pf2 && cp "@builddir@/"unicode.pf2 "$grubdir/fonts/unicode.pf2" - cp -R "@srcdir@/themes/starfield" "$grubdir/themes/starfield" - for file in "@srcdir@/po/"*.gmo; do + test -f "${builddir}/"unicode.pf2 && cp "${builddir}/"unicode.pf2 "$grubdir/fonts/unicode.pf2" + cp -R "${srcdir}/themes/starfield" "$grubdir/themes/starfield" + for file in "${srcdir}/po/"*.gmo; do if [ -f "$file" ]; then cp "$file" "$grubdir/locale/" fi @@ -505,7 +505,7 @@ elif [ x$boot = xemu ]; then [ -z "$files" ] || copy_extra_files "$rootdir" $files roottar="$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")" (cd "$rootdir"; tar cf "$roottar" .) - @builddir@/grub-core/grub-emu -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" | tr -d "\r" | do_trim + "${builddir}/grub-core/grub-emu" -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" | tr -d "\r" | do_trim test -n "$debug" || rm -rf "$rootdir" test -n "$debug" || rm -f "$roottar" else -- 2.34.1