vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove local keyword.

Browse source 
* util/grub-mkconfig_lib.in (version_test_numeric): Remove local.
	(version_test_gt): Likewise.
	(version_find_latest): Likewise.
	(gettext_printf): Likewise.
	* util/grub.d/10_windows.in (get_os_name_from_boot_ini): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-10 08:46:09 +01:00
parent cb544caa2e
commit c3591189b8
3 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/grub.d/10_windows.in
View file

@ -42,14 +42,14 @@ get_os_name_from_boot_ini ()
sort | uniq | wc -l`" = 1 || return 1
# Search 'default=PARTITION'
local part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ \t\r]*$,,;1q'`
test -n "$part" || return 1
get_os_name_from_boot_ini_part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ \t\r]*$,,;1q'`
test -n "$get_os_name_from_boot_ini_part" || return 1
# Search 'PARTITION="NAME" ...'
local name=`sed -n 's,\\\\,/,g;s,^'"$part"'="\([^"]*\)".*$,\1,p' "$1" | sed 1q`
test -n "$name" || return 1
get_os_name_from_boot_ini_name=`sed -n 's,\\\\,/,g;s,^'"$get_os_name_from_boot_ini_part"'="\([^"]*\)".*$,\1,p' "$1" | sed 1q`
test -n "$get_os_name_from_boot_ini_name" || return 1
echo "$name"
echo "$get_os_name_from_boot_ini_name"
}