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

Apply program name transformations at build-time rather than at

Browse source 
run-time.  Fixes Debian bug #696465.

* acinclude.m4 (grub_TRANSFORM): New macro.
* configure.ac: Create output variables with transformed names for
most programs.
* util/bash-completion.d/grub-completion.bash.in: Use
pre-transformed variables for program names.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* tests/util/grub-shell-tester.in: Remove unused assignment.
* tests/util/grub-shell.in: Likewise.
* util/grub.d/00_header.in: Likewise.
This commit is contained in:
Colin Watson 2012-12-28 06:57:17 +00:00
parent 7024b3c0c2
commit fd49ceb35c
17 changed files with 76 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

24
util/bash-completion.d/grub-completion.bash.in
View file

@ -165,12 +165,12 @@ _grub_set_entry () {
fi
}
__grub_set_default_program=$( echo grub-set-default | sed "@program_transform_name@" )
__grub_set_default_program="@grub_set_default@"
have ${__grub_set_default_program} && \
complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
unset __grub_set_default_program
__grub_reboot_program=$( echo grub-reboot | sed "@program_transform_name@" )
__grub_reboot_program="@grub_reboot@"
have ${__grub_reboot_program} && \
complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
unset __grub_reboot_program
@ -197,7 +197,7 @@ _grub_editenv () {
create list set unset"
}
__grub_editenv_program=$( echo grub-editenv | sed "@program_transform_name@" )
__grub_editenv_program="@grub_editenv@"
have ${__grub_editenv_program} && \
complete -F _grub_editenv -o filenames ${__grub_editenv_program}
unset __grub_editenv_program
@ -218,7 +218,7 @@ _grub_mkconfig () {
_filedir
fi
}
__grub_mkconfig_program=$( echo grub-mkconfig | sed "@program_transform_name@" )
__grub_mkconfig_program="@grub_mkconfig@"
have ${__grub_mkconfig_program} && \
complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
unset __grub_mkconfig_program
@ -252,7 +252,7 @@ _grub_setup () {
_filedir
fi
}
__grub_setup_program=$( echo grub-setup | sed "@program_transform_name@" )
__grub_setup_program="@grub_setup@"
have ${__grub_setup_program} && \
complete -F _grub_setup -o filenames ${__grub_setup_program}
unset __grub_setup_program
@ -298,7 +298,7 @@ _grub_install () {
_filedir
fi
}
__grub_install_program=$( echo grub-install | sed "@program_transform_name@" )
__grub_install_program="@grub_install@"
have ${__grub_install_program} && \
complete -F _grub_install -o filenames ${__grub_install_program}
unset __grub_install_program
@ -320,7 +320,7 @@ _grub_mkfont () {
_filedir
fi
}
__grub_mkfont_program=$( echo grub-mkfont | sed "@program_transform_name@" )
__grub_mkfont_program="@grub_mkfont@"
have ${__grub_mkfont_program} && \
complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
unset __grub_mkfont_program
@ -351,7 +351,7 @@ _grub_mkrescue () {
_filedir
fi
}
__grub_mkrescue_program=$( echo grub-mkrescue | sed "@program_transform_name@" )
__grub_mkrescue_program="@grub_mkrescue@"
have ${__grub_mkrescue_program} && \
complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
unset __grub_mkrescue_program
@ -393,7 +393,7 @@ _grub_mkimage () {
_filedir
fi
}
__grub_mkimage_program=$( echo grub-mkimage | sed "@program_transform_name@" )
__grub_mkimage_program="@grub_mkimage@"
have ${__grub_mkimage_program} && \
complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
unset __grub_mkimage_program
@ -415,7 +415,7 @@ _grub_mkpasswd_pbkdf2 () {
_filedir
fi
}
__grub_mkpasswd_pbkdf2_program=$( echo grub-mkpasswd-pbkdf2 | sed "@program_transform_name@" )
__grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
have ${__grub_mkpasswd_pbkdf2_program} && \
complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
unset __grub_mkpasswd_pbkdf2_program
@ -453,7 +453,7 @@ _grub_probe () {
_filedir
fi
}
__grub_probe_program=$( echo grub-probe | sed "@program_transform_name@" )
__grub_probe_program="@grub_probe@"
have ${__grub_probe_program} && \
complete -F _grub_probe -o filenames ${__grub_probe_program}
unset __grub_probe_program
@ -475,7 +475,7 @@ _grub_script_check () {
_filedir
fi
}
__grub_script_check_program=$( echo grub-script-check | sed "@program_transform_name@" )
__grub_script_check_program="@grub_script_check@"
have ${__grub_script_check_program} && \
complete -F _grub_script_check -o filenames ${__grub_script_check_program}