818f3de1fa6588a94bf207766a811992e301acf1

Author
Carlo Sala <carlosalag@protonmail.com>
Committer
Marc Cornellà <hello@mcornella.com>
Date

Message

fix(debian)!: remove ar alias

BREAKING CHANGE: This alias needs to be removed because is shadowing
`ar` archiver.

Closes #9304

Diff

 1diff --git a/plugins/debian/README.md b/plugins/debian/README.md
 2index 2ce206cfbaca289b102b7d54ad8f73a9b6030407..1db534f1366517b1c408d5da4222bc90d4bafe03 100644
 3--- a/plugins/debian/README.md
 4+++ b/plugins/debian/README.md
 5@@ -30,26 +30,25 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 6 
 7 ## Superuser Operations Aliases
 8 
 9-| Alias    | Command                                                                                | Description                                                                                 |
10-| -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
11-| `aac`    | `sudo $apt_pref autoclean`                                                             | Clears out the local repository of retrieved package files                                  |
12-| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
13-| `abd`    | `sudo $apt_pref build-dep`                                                             | Installs all dependencies for building packages                                             |
14-| `ac`     | `sudo $apt_pref clean`                                                                 | Clears out the local repository of retrieved package files except lock files                |
15-| `ad`     | `sudo $apt_pref update`                                                                | Updates the package lists for upgrades for packages                                         |
16-| `adg`    | `sudo $apt_pref update && sudo $apt_pref $apt_upgr`                                    | Update and upgrade packages                                                                 |
17-| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
18-| `adu`    | `sudo $apt_pref update && sudo $apt_pref dist-upgrade`                                 | Smart upgrade that handles dependencies                                                     |
19-| `afu`    | `sudo apt-file update`                                                                 | Update the files in packages                                                                |
20-| `ai`     | `sudo $apt_pref install`                                                               | Command-line tool to install package                                                        |
21-| `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
22-| `alu`    | `sudo apt update && apt list -u && sudo apt upgrade`                                   | Update, list and upgrade packages                                                           |
23-| `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
24-| `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
25-| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
26-| `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
27-| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
28-| `kclean` | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`               | Remove ALL kernel images and headers EXCEPT the one in use                                  |
29+| Alias    | Command                                                                               | Description                                                                                 |
30+| -------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
31+| `aac`    | `sudo $apt_pref autoclean`                                                            | Clears out the local repository of retrieved package files                                  |
32+| `aar`    | `sudo $apt_pref autoremove`                                                           | Removes packages installed automatically that are no longer needed                          |
33+| `abd`    | `sudo $apt_pref build-dep`                                                            | Installs all dependencies for building packages                                             |
34+| `ac`     | `sudo $apt_pref clean`                                                                | Clears out the local repository of retrieved package files except lock files                |
35+| `ad`     | `sudo $apt_pref update`                                                               | Updates the package lists for upgrades for packages                                         |
36+| `adg`    | `sudo $apt_pref update && sudo $apt_pref $apt_upgr`                                   | Update and upgrade packages                                                                 |
37+| `ads`    | `sudo apt-get dselect-upgrade`                                                        | Installs packages from list and removes all not in the list                                 |
38+| `adu`    | `sudo $apt_pref update && sudo $apt_pref dist-upgrade`                                | Smart upgrade that handles dependencies                                                     |
39+| `afu`    | `sudo apt-file update`                                                                | Update the files in packages                                                                |
40+| `ai`     | `sudo $apt_pref install`                                                              | Command-line tool to install package                                                        |
41+| `ail`    | `sed -e 's/ */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
42+| `alu`    | `sudo apt update && apt list -u && sudo apt upgrade`                                  | Update, list and upgrade packages                                                           |
43+| `ap`     | `sudo $apt_pref purge`                                                                | Removes packages along with configuration files                                             |
44+| `au`     | `sudo $apt_pref $apt_upgr`                                                            | Install package upgrades                                                                    |
45+| `di`     | `sudo dpkg -i`                                                                        | Install all .deb files in the current directory                                             |
46+| `dia`    | `sudo dpkg -i ./*.deb`                                                                | Install all .deb files in the current directory                                             |
47+| `kclean` | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`              | Remove ALL kernel images and headers EXCEPT the one in use                                  |
48 
49 ## Aliases - Commands using `su`
50 
51diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
52index f649a5b164ced650009fa47447a17ca02630ff44..2d8c4666ecd7333a33e420da89eb2a363c3330a0 100644
53--- a/plugins/debian/debian.plugin.zsh
54+++ b/plugins/debian/debian.plugin.zsh
55@@ -55,7 +55,6 @@ if [[ $use_sudo -eq 1 ]]; then
56 
57     alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | xargs sudo $apt_pref install"
58     alias ap="sudo $apt_pref purge"
59-    alias ar="sudo $apt_pref remove"
60     alias aar="sudo $apt_pref autoremove"
61 
62     # apt-get only
63@@ -98,11 +97,6 @@ else
64         print "$cmd"
65         eval "$cmd"
66     }
67-    function ar() {
68-        cmd="su -lc '$apt_pref remove $@' root"
69-        print "$cmd"
70-        eval "$cmd"
71-    }
72     function aar() {
73         cmd="su -lc '$apt_pref autoremove $@' root"
74         print "$cmd"
75@@ -147,7 +141,6 @@ apt_pref_compdef au  "$apt_upgr"
76 apt_pref_compdef ai  "install"
77 apt_pref_compdef ail "install"
78 apt_pref_compdef ap  "purge"
79-apt_pref_compdef ar  "remove"
80 apt_pref_compdef aar  "autoremove"
81 apt_pref_compdef ads "dselect-upgrade"
82