From 9d607b9eb2376509fb6cb2c488fd9a50cd47b9e6 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sat, 30 Dec 2023 22:09:14 +0800 Subject: [PATCH 01/11] Update package-manager.aliases.bash remove duplicate 'ers' --- aliases/package-manager.aliases.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index 57dfa9131..a55109f39 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -21,7 +21,6 @@ if _omb_util_binary_exists emerge; then alias esync="${_omb_tmp_sudo}emerge --sync" # Enoch SYNC alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove - alias ers="${_omb_tmp_sudo}emerge -c" # Enoch Remove Systempackage alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDUj @world" alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From 4737cfc7be9d0b3969dccf36c5b41c11b0e42aeb Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sat, 30 Dec 2023 22:25:47 +0800 Subject: [PATCH 02/11] Update package-manager.aliases.bash improve 'emfu': remove -j and change -U to -N --- aliases/package-manager.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index a55109f39..a2264aff9 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -21,7 +21,7 @@ if _omb_util_binary_exists emerge; then alias esync="${_omb_tmp_sudo}emerge --sync" # Enoch SYNC alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove - alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDUj @world" + alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From 2905b1750b49997b33a53684fa9d71c12941d2c1 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 31 Dec 2023 21:52:58 +0800 Subject: [PATCH 03/11] Update package-manager.aliases.bash add 'ec' for cleaning repository source files --- aliases/package-manager.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index a2264aff9..c60139a67 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -22,6 +22,7 @@ if _omb_util_binary_exists emerge; then alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" + alias ec="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From 1a2e4ee5a4fa65037c96ee91292e8a91814d3be0 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 31 Dec 2023 21:59:02 +0800 Subject: [PATCH 04/11] Update package-manager.aliases.bash add description for 'emfu' --- aliases/package-manager.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index c60139a67..8fa944cce 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -21,7 +21,7 @@ if _omb_util_binary_exists emerge; then alias esync="${_omb_tmp_sudo}emerge --sync" # Enoch SYNC alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove - alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" + alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" # Enoch Upgrade System alias ec="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From b7262b5ff1125efbc6b93c81176a0331098c8a7e Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Mon, 1 Jan 2024 10:37:25 +0800 Subject: [PATCH 05/11] Update package-manager.aliases.bash add 'ecp' for cleaning binary packages --- aliases/package-manager.aliases.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index 8fa944cce..595269f1d 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -22,7 +22,8 @@ if _omb_util_binary_exists emerge; then alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" # Enoch Upgrade System - alias ec="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files + alias ecd="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files + alias ecp="${_omb_tmp_sudo}eclean-pkg -d" # Enoch Clean Binary Packages alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From 11e9db6093063cec7a9ca0beadd11f983ebf6196 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Mon, 1 Jan 2024 10:56:38 +0800 Subject: [PATCH 06/11] Update README.md --- aliases/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aliases/README.md b/aliases/README.md index 6201ea629..7f307fae8 100644 --- a/aliases/README.md +++ b/aliases/README.md @@ -118,8 +118,9 @@ OMB_ALIAS_PACKAGE_MANAGER_SUDO= | `esync` | `sudo emerge --sync` | Updates repositories, for which auto-sync, sync-type and sync-uri attributes are set in repos.conf. | | `eb` | `sudo ebuild` | An ebuild must be, at a minimum, a valid Portage package directory name without a version or category, such as portage or python. | | `er` | `sudo emerge -c` | Cleans the system by removing packages that are not associated with explicitly merged packages. | -| `ers` | `sudo emerge -c` | Cleans the system by removing packages that are not associated with explicitly merged packages. | -| `emfu` | `sudo emerge --sync && sudo emerge -uDUj @world` | Emerge Update & Upgrade. | +| `emfu` | `sudo emerge --sync && sudo emerge -uDN @world` | Emerge Update & Upgrade. | +| `ecd` | `sudo eclean-dist -d` | Cleans repository source files | +| `ecp` | `sudo eclean-pkg -d` | Cleans binary packages | | `elip` | `sudo eix-installed -a` | List all installed programs. | ### Paludis Package Manager (`cave`) From c688baf59906372afc6d68052b0d6752894e0da6 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Mon, 1 Jan 2024 11:06:43 +0800 Subject: [PATCH 07/11] Update package-manager.aliases.bash add restrictions on running 'ecd', 'ecp', and 'elip'. --- aliases/package-manager.aliases.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index 595269f1d..c2f2ca719 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -22,8 +22,12 @@ if _omb_util_binary_exists emerge; then alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" # Enoch Upgrade System +fi +if _omb_util_binary_exists eclean; then alias ecd="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files alias ecp="${_omb_tmp_sudo}eclean-pkg -d" # Enoch Clean Binary Packages +fi +if _omb_util_binary_exists eix; then alias elip="${_omb_tmp_sudo}eix-installed -a" # Enoch List Installed Packages fi From a81f00dbbcb46c351f74948d085cb5ec9b0c11ac Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 14 Jan 2024 10:13:01 +0800 Subject: [PATCH 08/11] Update package-manager.aliases.bash restore 'ers' --- aliases/package-manager.aliases.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index c2f2ca719..cb2cdd975 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -22,6 +22,8 @@ if _omb_util_binary_exists emerge; then alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" # Enoch Upgrade System + # Deprecated, retained for backwards compatibility + alias ers="${_omb_tmp_sudo}emerge -c" # Enoch Remove Systempackage fi if _omb_util_binary_exists eclean; then alias ecd="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files From b957f69f00ffde91d040eccfbc45029baa0effd9 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 14 Jan 2024 10:24:40 +0800 Subject: [PATCH 09/11] Update README.md restore 'ers' --- aliases/README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/aliases/README.md b/aliases/README.md index 7f307fae8..945a1dff8 100644 --- a/aliases/README.md +++ b/aliases/README.md @@ -93,7 +93,7 @@ To activate it, add `debian` to `plugins(...)` in your `.bashrc` file: This plugin provides the set of aliases that can be used to control package managers. Here is the list of the supported aliases for each package manager. You can find the details of each alias in the source [`package-manager.aliases.bash`](package-manager.aliases.bash). -- `emerge` (Portage Enoch Merge) ... `em`, `es`, `esync`, `eb`, `er`, `ers`, `emfu`, `elip` +- `emerge` (Portage Enoch Merge) ... `em`, `es`, `esync`, `eb`, `er`, `emfu`, `ecd`, `ecp`, `elip` - `cave` (Paludis Cave) ... `cave`, `cr`, `cui`, `cs`, `cli` - `apt` (Advanced Packaging Tool) ... `apt`, `aptfu`, `apti`, `apts`, `aptr`, `aptar`, `aptli` - `dpkg` (Debian Package) ... `dpkg` @@ -111,17 +111,18 @@ OMB_ALIAS_PACKAGE_MANAGER_SUDO= ### Emerge Package Manager -| Alias | Command | Description | -| ------- | ------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------- | -| `em` | `sudo emerge` | Emerge is the definitive command-line interface to the Portage system. | -| `es` | `sudo emerge --search` | Searches for matches of the supplied string in the ebuild repository. | -| `esync` | `sudo emerge --sync` | Updates repositories, for which auto-sync, sync-type and sync-uri attributes are set in repos.conf. | -| `eb` | `sudo ebuild` | An ebuild must be, at a minimum, a valid Portage package directory name without a version or category, such as portage or python. | -| `er` | `sudo emerge -c` | Cleans the system by removing packages that are not associated with explicitly merged packages. | -| `emfu` | `sudo emerge --sync && sudo emerge -uDN @world` | Emerge Update & Upgrade. | -| `ecd` | `sudo eclean-dist -d` | Cleans repository source files | -| `ecp` | `sudo eclean-pkg -d` | Cleans binary packages | -| `elip` | `sudo eix-installed -a` | List all installed programs. | +| Alias | Command | Description | +| ------- | ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------- | +| `em` | `sudo emerge` | Emerge is the definitive command-line interface to the Portage system. | +| `es` | `sudo emerge --search` | Searches for matches of the supplied string in the ebuild repository. | +| `esync` | `sudo emerge --sync` | Updates repositories, for which auto-sync, sync-type and sync-uri attributes are set in repos.conf. | +| `eb` | `sudo ebuild` | An ebuild must be, at a minimum, a valid Portage package directory name without a version or category, such as portage or python. | +| `er` | `sudo emerge -c` | Cleans the system by removing packages that are not associated with explicitly merged packages. | +| `emfu` | `sudo emerge --sync && sudo emerge -uDN @world` | Emerge Update & Upgrade. | +| `ecd` | `sudo eclean-dist -d` | Cleans repository source files | +| `ecp` | `sudo eclean-pkg -d` | Cleans binary packages | +| `elip` | `sudo eix-installed -a` | List all installed programs. | +| `ers` | `sudo emerge -c` | Deprecated, retained for backwards compatibility. Cleans the system by removing packages that are not associated with explicitly merged packages. | ### Paludis Package Manager (`cave`) From 0aae30efe7c54c99c0d902891fa5748d46f121e2 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 14 Jan 2024 10:36:19 +0800 Subject: [PATCH 10/11] Update README.md better wording for 'ers' --- aliases/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/README.md b/aliases/README.md index 945a1dff8..febbe6597 100644 --- a/aliases/README.md +++ b/aliases/README.md @@ -122,7 +122,7 @@ OMB_ALIAS_PACKAGE_MANAGER_SUDO= | `ecd` | `sudo eclean-dist -d` | Cleans repository source files | | `ecp` | `sudo eclean-pkg -d` | Cleans binary packages | | `elip` | `sudo eix-installed -a` | List all installed programs. | -| `ers` | `sudo emerge -c` | Deprecated, retained for backwards compatibility. Cleans the system by removing packages that are not associated with explicitly merged packages. | +| `ers` | `sudo emerge -c` | (Deprecated, retained for backward compatibility. Use `er` instead.) | ### Paludis Package Manager (`cave`) From 14ba7e104ad14ef65defcdff7887747f22f55708 Mon Sep 17 00:00:00 2001 From: Blackteahamburger Date: Sun, 14 Jan 2024 10:39:33 +0800 Subject: [PATCH 11/11] Update package-manager.aliases.bash better wording for the comment of 'ers' --- aliases/package-manager.aliases.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aliases/package-manager.aliases.bash b/aliases/package-manager.aliases.bash index cb2cdd975..c40d9a5e2 100644 --- a/aliases/package-manager.aliases.bash +++ b/aliases/package-manager.aliases.bash @@ -22,8 +22,8 @@ if _omb_util_binary_exists emerge; then alias eb="${_omb_tmp_sudo}ebuild" # Enoch Build alias er="${_omb_tmp_sudo}emerge -c" # Enoch Remove alias emfu="${_omb_tmp_sudo}emerge --sync && ${_omb_tmp_sudo}emerge -uDN @world" # Enoch Upgrade System - # Deprecated, retained for backwards compatibility - alias ers="${_omb_tmp_sudo}emerge -c" # Enoch Remove Systempackage + # Deprecated, retained for backward compatibility. Use `er` instead. + alias ers="${_omb_tmp_sudo}emerge -c" fi if _omb_util_binary_exists eclean; then alias ecd="${_omb_tmp_sudo}eclean-dist -d" # Enoch Clean Repository Source Files