[PR PATCH] Fix help output alphabetically

[PR PATCH] Fix help output alphabetically

[melroy89]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

There is a new pull request by melroy89 against master on the void-packages repository

https://github.com/melroy89/void-packages fix_help_output_alphabetically
https://github.com/void-linux/void-packages/pull/48641

Fix help output alphabetically
Fix the help output of `xbps-src`, make the help output alphabetically again!

#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/48641.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_help_output_alphabetically-48641.patch --]
[-- Type: text/x-diff, Size: 5186 bytes --]

From ccaa75c8031373d6767e7c36cc98247e09eb8b4d Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <melroy@melroy.org>
Date: Sat, 10 Feb 2024 18:44:11 +0100
Subject: [PATCH] Fix help output alphabetically

---
 xbps-src | 80 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/xbps-src b/xbps-src
index 77695b9f510d3..8de4df9872f86 100755
--- a/xbps-src
+++ b/xbps-src
@@ -30,49 +30,52 @@ bootstrap-update
     Updates bootstrap packages with latest versions available from registered
     repositories in the XBPS configuration file.
 
-consistency-check
-    Runs a consistency check on all packages
+build <pkgname>
+    Build package source (fetch + extract + patch + configure + build).
 
 chroot
     Enter to the chroot in <masterdir>.
 
+check <pkgname>
+    Run the package check(s) after building the package source.
+
+clean [pkgname]
+    Removes auto dependencies, cleans up <masterdir>/builddir and <masterdir>/destdir.
+    If <pkgname> argument is specified, package files from <masterdir>/destdir and its
+    build directory in <masterdir>/buiddir are removed.
+
 clean-repocache
     Removes obsolete packages from <hostdir>/repocache.
 
-fetch <pkgname>
-    Download package source distribution file(s).
+configure <pkgname>
+    Configure a package (fetch + extract + patch + configure).
+
+consistency-check
+    Runs a consistency check on all packages
 
 extract <pkgname>
     Extract package source distribution file(s) into the build directory.
     By default set to <masterdir>/builddir.
 
-patch <pkgname>
-    Patch the package sources and perform other operations required to
-    prepare a package for configuring and building
-
-configure <pkgname>
-    Configure a package (fetch + extract + patch + configure).
-
-build <pkgname>
-    Build package source (fetch + extract + patch + configure + build).
-
-check <pkgname>
-    Run the package check(s) after building the package source.
+fetch <pkgname>
+    Download package source distribution file(s).
 
 install <pkgname>
     Install target package into <destdir> but not building the binary package
     and not removing build directory for inspection purposes.
 
+list
+    Lists installed packages in <masterdir>.
+
+patch <pkgname>
+    Patch the package sources and perform other operations required to
+    prepare a package for configuring and building
+
 pkg <pkgname>
     Build binary package for <pkgname> and all required dependencies.
 
-clean [pkgname]
-    Removes auto dependencies, cleans up <masterdir>/builddir and <masterdir>/destdir.
-    If <pkgname> argument is specified, package files from <masterdir>/destdir and its
-    build directory in <masterdir>/buiddir are removed.
-
-list
-    Lists installed packages in <masterdir>.
+purge-distfiles
+    Removes all obsolete distfiles in <hostdir>/sources.
 
 remove <pkgname>
     Remove target package from <destdir>. If <pkgname>-<version> is not matched
@@ -81,9 +84,6 @@ remove <pkgname>
 remove-autodeps
     Removes all package dependencies that were installed automatically.
 
-purge-distfiles
-    Removes all obsolete distfiles in <hostdir>/sources.
-
 show <pkgname>
     Show information for the specified package.
 
@@ -107,26 +107,26 @@ show-hostmakedepends <pkgname>
 show-makedepends <pkgname>
     Show required target build dependencies for <pkgname>.
 
+show-local-updates
+    Prints the list of outdated packages in your local repositories.
+
 show-options <pkgname>
     Show available build options by <pkgname>.
 
+show-repo-updates
+    Prints the list of outdated packages in XBPS repositories.
+
 show-shlib-provides <pkgname>
     Show list of provided shlibs for <pkgname>. Package must be installed into destdir.
 
 show-shlib-requires <pkgname>
     Show list of required shlibs for <pkgname>. Package must be installed into destdir.
 
-show-var <var>
-    Prints the value of <var> if it's defined in xbps-src.
-
-show-repo-updates
-    Prints the list of outdated packages in XBPS repositories.
-
 show-sys-updates
     Prints the list of outdated packages in your system.
 
-show-local-updates
-    Prints the list of outdated packages in your local repositories.
+show-var <var>
+    Prints the value of <var> if it's defined in xbps-src.
 
 sort-dependencies <pkg> <pkgN+1> ...
     Given a list of packages specified as additional arguments, a sorted dependency
@@ -135,18 +135,18 @@ sort-dependencies <pkg> <pkgN+1> ...
 update-bulk
     Rebuilds all packages in the system repositories that are outdated.
 
-update-sys
-    Rebuilds all packages in your system that are outdated and updates them.
-
-update-local
-    Rebuilds all packages in your local repositories that are outdated.
-
 update-check <pkgname>
     Check upstream site of <pkgname> for new releases.
 
 update-hash-cache
     Update the hash cache with existing source distfiles.
 
+update-local
+    Rebuilds all packages in your local repositories that are outdated.
+
+update-sys
+    Rebuilds all packages in your system that are outdated and updates them.
+
 zap
     Removes a masterdir but preserving ccache, distcc and host directories.
 

Re: [PR PATCH] [Updated] Fix help output alphabetically

[melroy89]

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

There is an updated pull request by melroy89 against master on the void-packages repository

https://github.com/melroy89/void-packages fix_help_output_alphabetically
https://github.com/void-linux/void-packages/pull/48641

Fix help output alphabetically
Fix the help output of `xbps-src`, make the help output alphabetically again!

#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/48641.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_help_output_alphabetically-48641.patch --]
[-- Type: text/x-diff, Size: 5196 bytes --]

From a648428a2f2c2e989103225a4c49f87bba931675 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <melroy@melroy.org>
Date: Sat, 10 Feb 2024 18:55:48 +0100
Subject: [PATCH] xbps-src: Fix help output alphabetically

---
 xbps-src | 80 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/xbps-src b/xbps-src
index 77695b9f510d3..8de4df9872f86 100755
--- a/xbps-src
+++ b/xbps-src
@@ -30,49 +30,52 @@ bootstrap-update
     Updates bootstrap packages with latest versions available from registered
     repositories in the XBPS configuration file.
 
-consistency-check
-    Runs a consistency check on all packages
+build <pkgname>
+    Build package source (fetch + extract + patch + configure + build).
 
 chroot
     Enter to the chroot in <masterdir>.
 
+check <pkgname>
+    Run the package check(s) after building the package source.
+
+clean [pkgname]
+    Removes auto dependencies, cleans up <masterdir>/builddir and <masterdir>/destdir.
+    If <pkgname> argument is specified, package files from <masterdir>/destdir and its
+    build directory in <masterdir>/buiddir are removed.
+
 clean-repocache
     Removes obsolete packages from <hostdir>/repocache.
 
-fetch <pkgname>
-    Download package source distribution file(s).
+configure <pkgname>
+    Configure a package (fetch + extract + patch + configure).
+
+consistency-check
+    Runs a consistency check on all packages
 
 extract <pkgname>
     Extract package source distribution file(s) into the build directory.
     By default set to <masterdir>/builddir.
 
-patch <pkgname>
-    Patch the package sources and perform other operations required to
-    prepare a package for configuring and building
-
-configure <pkgname>
-    Configure a package (fetch + extract + patch + configure).
-
-build <pkgname>
-    Build package source (fetch + extract + patch + configure + build).
-
-check <pkgname>
-    Run the package check(s) after building the package source.
+fetch <pkgname>
+    Download package source distribution file(s).
 
 install <pkgname>
     Install target package into <destdir> but not building the binary package
     and not removing build directory for inspection purposes.
 
+list
+    Lists installed packages in <masterdir>.
+
+patch <pkgname>
+    Patch the package sources and perform other operations required to
+    prepare a package for configuring and building
+
 pkg <pkgname>
     Build binary package for <pkgname> and all required dependencies.
 
-clean [pkgname]
-    Removes auto dependencies, cleans up <masterdir>/builddir and <masterdir>/destdir.
-    If <pkgname> argument is specified, package files from <masterdir>/destdir and its
-    build directory in <masterdir>/buiddir are removed.
-
-list
-    Lists installed packages in <masterdir>.
+purge-distfiles
+    Removes all obsolete distfiles in <hostdir>/sources.
 
 remove <pkgname>
     Remove target package from <destdir>. If <pkgname>-<version> is not matched
@@ -81,9 +84,6 @@ remove <pkgname>
 remove-autodeps
     Removes all package dependencies that were installed automatically.
 
-purge-distfiles
-    Removes all obsolete distfiles in <hostdir>/sources.
-
 show <pkgname>
     Show information for the specified package.
 
@@ -107,26 +107,26 @@ show-hostmakedepends <pkgname>
 show-makedepends <pkgname>
     Show required target build dependencies for <pkgname>.
 
+show-local-updates
+    Prints the list of outdated packages in your local repositories.
+
 show-options <pkgname>
     Show available build options by <pkgname>.
 
+show-repo-updates
+    Prints the list of outdated packages in XBPS repositories.
+
 show-shlib-provides <pkgname>
     Show list of provided shlibs for <pkgname>. Package must be installed into destdir.
 
 show-shlib-requires <pkgname>
     Show list of required shlibs for <pkgname>. Package must be installed into destdir.
 
-show-var <var>
-    Prints the value of <var> if it's defined in xbps-src.
-
-show-repo-updates
-    Prints the list of outdated packages in XBPS repositories.
-
 show-sys-updates
     Prints the list of outdated packages in your system.
 
-show-local-updates
-    Prints the list of outdated packages in your local repositories.
+show-var <var>
+    Prints the value of <var> if it's defined in xbps-src.
 
 sort-dependencies <pkg> <pkgN+1> ...
     Given a list of packages specified as additional arguments, a sorted dependency
@@ -135,18 +135,18 @@ sort-dependencies <pkg> <pkgN+1> ...
 update-bulk
     Rebuilds all packages in the system repositories that are outdated.
 
-update-sys
-    Rebuilds all packages in your system that are outdated and updates them.
-
-update-local
-    Rebuilds all packages in your local repositories that are outdated.
-
 update-check <pkgname>
     Check upstream site of <pkgname> for new releases.
 
 update-hash-cache
     Update the hash cache with existing source distfiles.
 
+update-local
+    Rebuilds all packages in your local repositories that are outdated.
+
+update-sys
+    Rebuilds all packages in your system that are outdated and updates them.
+
 zap
     Removes a masterdir but preserving ccache, distcc and host directories.
 

Re: Fix help output alphabetically

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/48641#issuecomment-1937091235

Comment:
It wasn't omission, build steps are next each other and ordered.
I would rather group other by use and add section titles than sort alphabetically.

Re: [PR PATCH] [Closed]: Fix help output alphabetically

[melroy89]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

There's a closed pull request on the void-packages repository

Fix help output alphabetically
https://github.com/void-linux/void-packages/pull/48641

Description:
Fix the help output of `xbps-src`, make the help output alphabetically again!

#### Testing the changes
- I tested the changes in this PR: **YES**