Changeset 3876300 in mainline for tools/grub

Timestamp:

2016-04-05T18:32:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cfb1217

Parents:

5823f4da

Message:

Do not depend on scripts being run from the directory they reside in.

Location:

tools/grub

Files:

• grub-update.sh (modified) (1 diff)
• mkimage.sh (modified) (1 diff)

tools/grub/grub-update.sh

@@ -33 +33 @@
 #
 
-origdir="$(pwd)"
+origdir="$(cd "$(dirname "$0")" && pwd)"
 helenosdir="$origdir/../.."
-workdir="$(pwd)/grub-src"
-builddir="$(pwd)/grub-build"
+workdir="$origdir/grub-src"
+builddir="$origdir/grub-build"
 git_repo="git://git.savannah.gnu.org/grub.git"
 grub_rev="bc220962e366b1b46769ed6f9fa5be603ba58ab5"

tools/grub/mkimage.sh

@@ -37 +37 @@
 #
 
-grub_tools_dir="$(pwd)"/grub-build/i386-pc/bin
-grub_mod_dir="$(pwd)"/../../boot/grub.pc/i386-pc
+orig_dir="$(cd "$(dirname "$0")" && pwd)"
+grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
+grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
 
 "$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \
-    --prefix "$grub_mod_dir" --output "$grub_mod_dir"/"core.img" \
-    --format 'i386-pc' --compression 'auto' --config "$(pwd)"/"load.cfg" \
+    --prefix "$grub_mod_dir" --output "$grub_mod_dir/core.img" \
+    --format 'i386-pc' --compression 'auto' --config "$orig_dir/load.cfg" \
     "minix3" "part_msdos" "biosdisk" "search_fs_uuid"