From 7e95703d61a722e3483a84bddfcfaf3dc4ef66e4 Mon Sep 17 00:00:00 2001 From: Heather Date: Wed, 19 Feb 2014 09:59:12 +0400 Subject: [PATCH 1/2] remove -h as --help variant from du because of conflict --- du/du.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du/du.rs b/du/du.rs index bb8e8ac02..482b1fd15 100644 --- a/du/du.rs +++ b/du/du.rs @@ -141,7 +141,7 @@ fn main() { // In main getopts::optopt("", "time-style", "show times using style STYLE: full-iso, long-iso, iso, +FORMAT FORMAT is interpreted like 'date'", "STYLE"), - getopts::optflag("h", "help", "display this help and exit"), + getopts::optflag("", "help", "display this help and exit"), getopts::optflag("V", "version", "output version information and exit"), ]; From b364e6474619366e27b7596d928eb2cfd7529462 Mon Sep 17 00:00:00 2001 From: Heather Date: Wed, 19 Feb 2014 09:59:48 +0400 Subject: [PATCH 2/2] move tty to UNIX_PROGS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 28fc3f22a..d01d750fc 100644 --- a/Makefile +++ b/Makefile @@ -28,13 +28,13 @@ PROGS := \ truncate \ wc \ yes \ - tty \ hostname \ head \ UNIX_PROGS := \ users \ whoami \ + tty \ id ifneq ($(OS),Windows_NT)