Rename afterclean to cleanafter

This makes more sense and falls in line with the structs value which has always been cleanafter. afterclean is still useable for compatibility but is undocumented.
Daanikus · Sep 27, 2018 · 4cc57dd · 4cc57dd
1 parent 42cba53
commit 4cc57dd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/cmd.go b/cmd.go
@@ -79,8 +79,8 @@ Permanent configuration options:
     --removemake          Remove makedepends after install
     --noremovemake        Don't remove makedepends after install
 
-    --afterclean          Remove package sources after successful install
-    --noafterclean        Do not remove package sources after successful build
+    --cleanafter          Remove package sources after successful install
+    --nocleanafter        Do not remove package sources after successful build
     --bottomup            Shows AUR's packages first and then repository's
     --topdown             Shows repository's packages first and then AUR's
 

diff --git a/completions/bash b/completions/bash
@@ -66,7 +66,7 @@ _yay() {
            makepkg pacman tar git gpg gpgflags config requestsplitn sudoloop nosudoloop
            redownload noredownload redownloadall rebuild rebuildall rebuildtree norebuild
            sortby answerclean answerdiff answeredit answerupgrade noanswerclean noanswerdiff
-           noansweredit noanswerupgrade cleanmenu diffmenu editmenu upgrademenu
+           noansweredit noanswerupgrade cleanmenu diffmenu editmenu upgrademenu cleanafter nocleanafter
            nocleanmenu nodiffmenu noupgrademenu provides noprovides pgpfetch nopgpfetch
            useask nouseask combinedupgrade nocombinedupgrade aur repo makepkgconf
            nomakepkgconf askremovemake removemake noremovemake completioninterval aururl'

diff --git a/completions/fish b/completions/fish
@@ -65,8 +65,8 @@ complete -c $progname -n "not $noopt" -l topdown -d 'Shows repository packages f
 complete -c $progname -n "not $noopt" -l bottomup -d 'Shows aur packages first and then repository' -f
 complete -c $progname -n "not $noopt" -l devel -d 'Check -git/-svn/-hg development version' -f
 complete -c $progname -n "not $noopt" -l nodevel -d 'Disable development version checking' -f
-complete -c $progname -n "not $noopt" -l afterclean -d 'Clean package sources after successful build' -f
-complete -c $progname -n "not $noopt" -l noafterclean -d 'Disable package sources cleaning' -f
+complete -c $progname -n "not $noopt" -l cleanafter -d 'Clean package sources after successful build' -f
+complete -c $progname -n "not $noopt" -l nocleanafter -d 'Disable package sources cleaning' -f
 complete -c $progname -n "not $noopt" -l timeupdate -d 'Check package modification date and version' -f
 complete -c $progname -n "not $noopt" -l notimeupdate -d 'Check only package version change' -f
 

diff --git a/completions/zsh b/completions/zsh
@@ -80,8 +80,8 @@ _pacman_opts_common=(
 	'--topdown[Show repository packages first]'
 	'--devel[Check -git/-svn/-hg development version]'
 	'--nodevel[Disable development version checking]'
-	'--afterclean[Clean package sources after successful build]'
-	'--noafterclean[Disable package sources cleaning after successful build]'
+	'--cleanafter[Clean package sources after successful build]'
+	'--nocleanafter[Disable package sources cleaning after successful build]'
 	'--timeupdate[Check packages modification date and version]'
 	'--notimeupdate[Check only package version change]'
 	'--redownload[Always download pkgbuilds of targets]'

diff --git a/doc/yay.8 b/doc/yay.8
@@ -359,7 +359,7 @@ Download and update PKGBUILDs using tarballs. The above conditions about
 previously installed packages still apply.
 
 .TP
-.B \-\-afterclean
+.B \-\-cleanafter
 Remove package sources after successful Install.
 
 For packages downloaded through git, untracked files are removed with the
@@ -369,7 +369,7 @@ instead of having to re clone the entire repo.
 For packages downloaded via tarball, The entire directory is deleted.
 
 .TP
-.B \-\-noafterclean
+.B \-\-nocleanafter
 Do not remove package sources after successful Install.
 
 .TP

diff --git a/parser.go b/parser.go
@@ -419,8 +419,8 @@ func isArg(arg string) bool {
 	//yay options
 	case "aururl":
 	case "save":
-	case "afterclean":
-	case "noafterclean":
+	case "afterclean", "cleanafter":
+	case "noafterclean", "nocleanafter":
 	case "devel":
 	case "nodevel":
 	case "timeupdate":
@@ -501,9 +501,9 @@ func handleConfig(option, value string) bool {
 		config.AURURL = value
 	case "save":
 		shouldSaveConfig = true
-	case "afterclean":
+	case "afterclean", "cleanafter":
 		config.CleanAfter = true
-	case "noafterclean":
+	case "noafterclean", "nocleanafter":
 		config.CleanAfter = false
 	case "devel":
 		config.Devel = true