present platforms in OS on ARCH order

git-svn-id: svn://tug.org/texlive/trunk@35578 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 6 insertions, 5 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index bf82453da32..50efab9ba22 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -950,7 +950,7 @@ sub menu_select_binsystems {
   $sw->Label(-text => __("Select arch-os"))->pack(-padx => "2m", -pady => "2m");
   $f2 = $sw->Frame;
   my $f2l = $f2->Frame;
-  foreach my $sys (sort @diskarchs) {
+  foreach my $sys (sort TeXLive::TLUtils::sort_archs @diskarchs) {
     $f2l->Checkbutton(-variable => \$vars{"binary_$sys"}, 
       -command => sub { check_on_removal($sw, $sys); },
       -text => platform_desc($sys))->pack(-anchor => 'w');
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 88da0e2ecbe..bd0fdaa098c 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -268,13 +268,14 @@ sub binary_menu {
       push @binaries, $1;
     }
   }
-  @binaries=sort(@binaries);
+  
+  @binaries=sort TeXLive::TLUtils::sort_archs @binaries;
 
   foreach my $binary (@binaries) {
-    printf "   %s %s %-16s %s\n", $keys[$index],
+    printf "   %s %s %s (%s)\n", $keys[$index],
            button($vars{"binary_$binary"}),
-           "$binary",
-           platform_desc($binary);
+           platform_desc($binary),
+           "$binary";
     $keyval{"$keys[$index]"} = "binary_$binary";
     ++$index;
   }