GUB: add architecture compatibility check.

GUB: add architecture compatibility check.

[Valentin Villenave, 2010-11-21 18:04:08]

Greetings Jan, hi everybody,

These days, GNU/Linux has become so affordable for non-tech-savvy users that
most of them haven't the faintest idea whether they're running an x86 or x86_64
OS. Ubuntu, for example, in their most user-friendly installer Wubi, choose the
architecture without even telling (let alone asking) you about it.

This patch aims to make it harder for new users to install an inappropriate
build on their systems.

[janneke-list_xs4all.nl, 2010-11-22 09:58:26]

LGTM 

although... an automatic check on our web download page
suggesting the appropriate download [see firefox.com] would be
even more helpful?

v.villenave@gmail.com schreef op zo 21-11-2010 om 18:04 [+0000]:
> Reviewers: jan.nieuwenhuizen,
> 
> Message:
> Greetings Jan, hi everybody,
> 
> These days, GNU/Linux has become so affordable for non-tech-savvy users
> that most of them haven't the faintest idea whether they're running an
> x86 or x86_64 OS. Ubuntu, for example, in their most user-friendly
> installer Wubi, choose the architecture without even telling (let alone
> asking) you about it.
> 
> This patch aims to make it harder for new users to install an
> inappropriate build on their systems.
> 
> Description:
> GUB: add architecture compatibility check.
> 
> Please review this at http://codereview.appspot.com/3235042/
> 
> Affected files:
>    M gub/commands.py
>    sourcefiles/lilypond-sharhead.sh
> 
> 
> Index: gub/commands.py
> diff --git a/gub/commands.py b/gub/commands.py
> index  
>
ade6f47332c31191c45535929946896a4a908506..adc0e5bc9cea67e2479c78dc61f294b5453cfcc4
 
> 100644
> --- a/gub/commands.py
> +++ b/gub/commands.py
> @@ -456,7 +456,7 @@ class CreateShar (SerializedCommand):
>           header_length = 0
>           _z = misc.compression_flag (tarball)
>           header_length = len (script % locals ()) + 1
> -        used_in_sharhead  
> = '%(base_file)s %(name)s %(pretty_name)s %(version)s %(release)s
%(header_length)s %(_z)s'
> +        used_in_sharhead  
> = '%(base_file)s %(name)s %(pretty_name)s %(version)s %(release)s
%(header_length)s %(target_cpu)s %(_z)s'
>           used_in_sharhead % locals ()
>           loggedos.dump_file (logger, script % locals (), shar_file)
>           loggedos.system (logger, 'cat %(tarball)s >> %(shar_file)s' %  
> locals ())
> Index: sourcefiles/lilypond-sharhead.sh
> diff --git a/sourcefiles/lilypond-sharhead.sh  
> b/sourcefiles/lilypond-sharhead.sh
> index  
>
d7945d7c4f362c651d3eb61a9f1fc53f0cf1d4c3..09e18ae71a5bb57c3d32633b03a40d87e199bc77
 
> 100644
> --- a/sourcefiles/lilypond-sharhead.sh
> +++ b/sourcefiles/lilypond-sharhead.sh
> @@ -5,6 +5,8 @@ root="$HOME"
>   doc=no
>   extract=no
>   interactive=yes
> +arch=$(uname -m)
> +shopt -s nocasematch
> 
>   if test `id -u` = "0"; then
>       root=/usr/local
> @@ -60,18 +62,44 @@ done
> 
>   cat <<EOF
> 
> -%(name)s installer for version %(version)s release %(release)s.
> +%(name)s installer for version %(version)s release %(release)s,
> +%(target_cpu)s build.
>   For a list of options, abort (^C) then do:
>   sh $me --help
> 
>   EOF
> 
> +if test "$arch" != "%(target_cpu)s"; then
> +    cat <<EOF
> +
> +Warning: this build is not optimized for your architecture;
> +please install a ${arch} build instead.
> +
> +Press C to install the program anyway (not recommended),
> +E to only extract the program files, or any other key to exit.
> +EOF
> +    read -sn1 input
> +    case "$input" in
> +	C)
> +	  echo "Ignoring architecture incompatibility."
> +	;;
> +	E)
> +	  extract=yes;
> +	;;
> +	*)
> +	  exit 1
> +	;;
> +    esac
> +fi
> +
> +
>   if test "$extract" = "yes"; then
>       echo "extracting %(base_file)s"
>       tail -c+%(header_length)012d $0 > %(base_file)s
>       exit 0
>   fi
> 
> +
>   if test "$interactive" = "yes"; then
>       cat <<EOF
> 
> 
> 
> 
> _______________________________________________
> lilypond-devel mailing list
> lilypond-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/lilypond-devel

[Valentin Villenave, 2010-11-22 10:52:24]

On Mon, Nov 22, 2010 at 10:58 AM, Jan Nieuwenhuizen
<janneke-list@xs4all.nl> wrote:
> LGTM

Thanks! I'll let you push it, since I don't have writing rights.

> although... an automatic check on our web download page
> suggesting the appropriate download [see firefox.com] would be
> even more helpful?

Oh, that would certainly be very nice! I'll just open a tracker page
about that for now. (Another example is videolan.org ).

Cheers,
Valentin.

[janneke-list_xs4all.nl, 2010-11-22 10:58:47]

Sure, please send me the git format-patch version.

Valentin Villenave schreef op ma 22-11-2010 om 11:52 [+0100]:
> On Mon, Nov 22, 2010 at 10:58 AM, Jan Nieuwenhuizen
> <janneke-list@xs4all.nl> wrote:
> > LGTM
> 
> Thanks! I'll let you push it, since I don't have writing rights.
> 
> > although... an automatic check on our web download page
> > suggesting the appropriate download [see firefox.com] would be
> > even more helpful?
> 
> Oh, that would certainly be very nice! I'll just open a tracker page
> about that for now. (Another example is videolan.org ).
> 
> Cheers,
> Valentin.

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

[Valentin Villenave, 2010-11-22 12:20:01]

On Mon, Nov 22, 2010 at 11:58 AM, Jan Nieuwenhuizen
<janneke-list@xs4all.nl> wrote:
> Sure, please send me the git format-patch version.

There you go. (Sorry, I thought Rietveld kept these kind of data.)

Thanks!

Valentin.

[janneke-list_xs4all.nl, 2010-11-22 12:58:25]

Thanks, pushed

Valentin Villenave schreef op ma 22-11-2010 om 13:19 [+0100]:
> On Mon, Nov 22, 2010 at 11:58 AM, Jan Nieuwenhuizen
> <janneke-list@xs4all.nl> wrote:
> > Sure, please send me the git format-patch version.
> 
> There you go. (Sorry, I thought Rietveld kept these kind of data.)
> 
> Thanks!
> 
> Valentin.