refactor ~ clean up main directory (move '{mk,uu}main.rs' into src/#common)

src/arch/Cargo.toml

@@ -2,7 +2,7 @@
 name = "arch"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_arch"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "arch"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/base32/Cargo.toml

@@ -2,7 +2,7 @@
 name = "base32"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_base32"
@@ -18,4 +18,4 @@ optional = true
 
 [[bin]]
 name = "base32"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/base64/Cargo.toml

@@ -2,7 +2,7 @@
 name = "base64"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_base64"
@@ -14,4 +14,4 @@ features = ["encoding"]
 
 [[bin]]
 name = "base64"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/basename/Cargo.toml

@@ -2,7 +2,7 @@
 name = "basename"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_basename"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "basename"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/cat/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cat"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cat"
@@ -20,4 +20,4 @@ unix_socket = "0.5.0"
 
 [[bin]]
 name = "cat"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/chgrp/Cargo.toml

@@ -2,7 +2,7 @@
 name = "chgrp"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chgrp"
@@ -17,4 +17,4 @@ features = ["entries", "fs"]
 
 [[bin]]
 name = "chgrp"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/chmod/Cargo.toml

@@ -2,7 +2,7 @@
 name = "chmod"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chmod"
@@ -18,4 +18,4 @@ features = ["mode"]
 
 [[bin]]
 name = "chmod"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/chown/Cargo.toml

@@ -2,7 +2,7 @@
 name = "chown"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chown"
@@ -22,4 +22,4 @@ optional = true
 
 [[bin]]
 name = "chown"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/chroot/Cargo.toml

@@ -2,7 +2,7 @@
 name = "chroot"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chroot"
@@ -17,4 +17,4 @@ features = ["entries"]
 
 [[bin]]
 name = "chroot"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/cksum/Cargo.toml

@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "cksum"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/cksum/build.rs

@@ -15,7 +15,7 @@ use std::path::Path;
 
 const CRC_TABLE_LEN: usize = 256;
 
-#[path = "../../mkmain.rs"]
+#[path = "../#common/mkmain.rs"]
 mod mkmain;
 
 fn main() {

src/comm/Cargo.toml

@@ -2,7 +2,7 @@
 name = "comm"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_comm"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "comm"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/cp/Cargo.toml

@@ -5,7 +5,7 @@ authors = [
   "Jordy Dickinson <jordy.dickinson@gmail.com>",
   "Joshua S. Miller <jsmiller@uchicago.edu>",
 ]
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cp"
@@ -35,4 +35,4 @@ xattr="0.2.1"
 
 [[bin]]
 name = "cp"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/cut/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cut"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cut"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "cut"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/date/Cargo.toml

@@ -2,7 +2,7 @@
 name = "date"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_date"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "date"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/dircolors/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dircolors"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_dircolors"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "dircolors"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/dirname/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dirname"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_dirname"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "dirname"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/du/Cargo.toml

@@ -2,7 +2,7 @@
 name = "du"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_du"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "du"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/echo/Cargo.toml

@@ -2,7 +2,7 @@
 name = "echo"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_echo"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "echo"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/env/Cargo.toml

@@ -3,7 +3,7 @@ name = "env"
 version = "0.0.1"
 authors = ["uutils developers"]
 description = "Set each NAME to VALUE in the environment and run COMMAND"
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 edition = "2018"
 
 [lib]
@@ -18,4 +18,4 @@ rust-ini = "0.13.0"
 
 [[bin]]
 name = "env"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/expand/Cargo.toml

@@ -2,7 +2,7 @@
 name = "expand"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_expand"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "expand"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/expr/Cargo.toml

@@ -2,7 +2,7 @@
 name = "expr"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_expr"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "expr"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/factor/Cargo.toml

@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "factor"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/factor/build.rs

@@ -33,7 +33,7 @@ mod numeric;
 
 mod sieve;
 
-#[path = "../../mkmain.rs"]
+#[path = "../#common/mkmain.rs"]
 mod mkmain;
 
 // extended Euclid algorithm

src/false/Cargo.toml

@@ -2,7 +2,7 @@
 name = "false"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_false"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "false"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/fmt/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fmt"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_fmt"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "fmt"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/fold/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fold"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_fold"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "fold"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/groups/Cargo.toml

@@ -2,7 +2,7 @@
 name = "groups"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_groups"
@@ -14,4 +14,4 @@ features = ["entries"]
 
 [[bin]]
 name = "groups"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/hashsum/Cargo.toml

@@ -2,7 +2,7 @@
 name = "hashsum"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hashsum"
@@ -23,4 +23,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "hashsum"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/head/Cargo.toml

@@ -2,7 +2,7 @@
 name = "head"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_head"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "head"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/hostid/Cargo.toml

@@ -2,7 +2,7 @@
 name = "hostid"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hostid"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "hostid"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/hostname/Cargo.toml

@@ -2,7 +2,7 @@
 name = "hostname"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hostname"
@@ -16,4 +16,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "hostname"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/id/Cargo.toml

@@ -2,7 +2,7 @@
 name = "id"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_id"
@@ -14,4 +14,4 @@ features = ["entries", "process"]
 
 [[bin]]
 name = "id"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/install/Cargo.toml

@@ -2,7 +2,7 @@
 name = "install"
 version = "0.0.1"
 authors = ["Ben Eills <ben@beneills.com>"]
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_install"
@@ -18,4 +18,4 @@ time = "0.1.40"
 
 [[bin]]
 name = "install"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/join/Cargo.toml

@@ -2,7 +2,7 @@
 name = "join"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_join"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "join"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/kill/Cargo.toml

@@ -2,7 +2,7 @@
 name = "kill"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_kill"
@@ -17,4 +17,4 @@ features = ["signals"]
 
 [[bin]]
 name = "kill"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/link/Cargo.toml

@@ -2,7 +2,7 @@
 name = "link"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_link"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "link"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/ln/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ln"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ln"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "ln"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/logname/Cargo.toml

@@ -2,7 +2,7 @@
 name = "logname"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_logname"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "logname"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/ls/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ls"
 version = "0.0.1"
 authors = ["Jeremiah Peschka <jeremiah.peschka@gmail.com>"]
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ls"
@@ -24,4 +24,4 @@ features = ["entries", "fs"]
 
 [[bin]]
 name = "ls"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/mkdir/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mkdir"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mkdir"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "mkdir"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/mkfifo/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mkfifo"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mkfifo"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "mkfifo"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/mknod/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mknod"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mknod"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "mknod"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/mktemp/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mktemp"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mktemp"
@@ -16,4 +16,4 @@ tempfile = "2.1.5"
 
 [[bin]]
 name = "mktemp"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/more/Cargo.toml

@@ -2,7 +2,7 @@
 name = "more"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_more"
@@ -21,4 +21,4 @@ nix = "0.8.1"
 
 [[bin]]
 name = "more"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/mv/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mv"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mv"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "mv"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/nice/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nice"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nice"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "nice"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/nl/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nl"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nl"
@@ -19,4 +19,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "nl"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/nohup/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nohup"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nohup"
@@ -18,4 +18,4 @@ features = ["fs"]
 
 [[bin]]
 name = "nohup"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/nproc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nproc"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nproc"
@@ -16,4 +16,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "nproc"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/numfmt/Cargo.toml

@@ -2,7 +2,7 @@
 name = "numfmt"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_numfmt"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "numfmt"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/od/Cargo.toml

@@ -2,7 +2,7 @@
 name = "od"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_od"
@@ -17,4 +17,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "od"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/paste/Cargo.toml

@@ -2,7 +2,7 @@
 name = "paste"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_paste"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "paste"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/pathchk/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pathchk"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pathchk"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "pathchk"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/pinky/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pinky"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pinky"
@@ -14,4 +14,4 @@ features = ["utmpx", "entries"]
 
 [[bin]]
 name = "pinky"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/printenv/Cargo.toml

@@ -2,7 +2,7 @@
 name = "printenv"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_printenv"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "printenv"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/printf/Cargo.toml

@@ -2,7 +2,7 @@
 name = "printf"
 version = "0.0.1"
 authors = ["Nathan Ross"]
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_printf"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "printf"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/ptx/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ptx"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ptx"
@@ -19,4 +19,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "ptx"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/pwd/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pwd"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pwd"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "pwd"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/readlink/Cargo.toml

@@ -2,7 +2,7 @@
 name = "readlink"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_readlink"
@@ -18,4 +18,4 @@ features = ["fs"]
 
 [[bin]]
 name = "readlink"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/realpath/Cargo.toml

@@ -2,7 +2,7 @@
 name = "realpath"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_realpath"
@@ -17,4 +17,4 @@ features = ["fs"]
 
 [[bin]]
 name = "realpath"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/relpath/Cargo.toml

@@ -2,7 +2,7 @@
 name = "relpath"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_relpath"
@@ -17,4 +17,4 @@ features = ["fs"]
 
 [[bin]]
 name = "relpath"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/rm/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rm"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_rm"
@@ -16,4 +16,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "rm"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/rmdir/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rmdir"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_rmdir"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "rmdir"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/seq/Cargo.toml

@@ -2,7 +2,7 @@
 name = "seq"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_seq"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "seq"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/shred/Cargo.toml

@@ -2,7 +2,7 @@
 name = "shred"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_shred"
@@ -18,4 +18,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "shred"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/shuf/Cargo.toml

@@ -2,7 +2,7 @@
 name = "shuf"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_shuf"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "shuf"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/sleep/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sleep"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sleep"
@@ -17,4 +17,4 @@ features = ["parse_time"]
 
 [[bin]]
 name = "sleep"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/sort/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sort"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sort"
@@ -19,4 +19,4 @@ features = ["fs"]
 
 [[bin]]
 name = "sort"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/split/Cargo.toml

@@ -2,7 +2,7 @@
 name = "split"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_split"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "split"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/stat/Cargo.toml

@@ -2,7 +2,7 @@
 name = "stat"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_stat"
@@ -18,4 +18,4 @@ features = ["entries"]
 
 [[bin]]
 name = "stat"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/stdbuf/Cargo.toml

@@ -18,4 +18,4 @@ libstdbuf = { path="libstdbuf" }
 
 [[bin]]
 name = "stdbuf"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/stdbuf/build.rs

@@ -2,7 +2,7 @@ use std::env;
 use std::fs;
 use std::path::Path;
 
-#[path = "../../mkmain.rs"]
+#[path = "../#common/mkmain.rs"]
 mod mkmain;
 
 #[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "windows")))]

src/sum/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sum"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sum"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "sum"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/sync/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sync"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sync"
@@ -20,4 +20,4 @@ features = ["wide"]
 
 [[bin]]
 name = "sync"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tac/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tac"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tac"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "tac"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tail/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tail"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tail"
@@ -20,4 +20,4 @@ redox_syscall = "0.1"
 
 [[bin]]
 name = "tail"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tee/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tee"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tee"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "tee"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/test/Cargo.toml

@@ -2,7 +2,7 @@
 name = "test"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_test"
@@ -17,4 +17,4 @@ redox_syscall = "0.1"
 
 [[bin]]
 name = "test"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/timeout/Cargo.toml

@@ -2,7 +2,7 @@
 name = "timeout"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_timeout"
@@ -19,4 +19,4 @@ features = ["parse_time", "process"]
 
 [[bin]]
 name = "timeout"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/touch/Cargo.toml

@@ -2,7 +2,7 @@
 name = "touch"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_touch"
@@ -19,4 +19,4 @@ features = ["libc"]
 
 [[bin]]
 name = "touch"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tr/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tr"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tr"
@@ -16,4 +16,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "tr"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/true/Cargo.toml

@@ -2,7 +2,7 @@
 name = "true"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_true"
@@ -13,4 +13,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "true"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/truncate/Cargo.toml

@@ -2,7 +2,7 @@
 name = "truncate"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_truncate"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "truncate"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tsort/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tsort"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tsort"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "tsort"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/tty/Cargo.toml

@@ -2,7 +2,7 @@
 name = "tty"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tty"
@@ -18,4 +18,4 @@ features = ["fs"]
 
 [[bin]]
 name = "tty"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/uname/Cargo.toml

@@ -2,7 +2,7 @@
 name = "uname"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uname"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "uname"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/unexpand/Cargo.toml

@@ -2,7 +2,7 @@
 name = "unexpand"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_unexpand"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "unexpand"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/uniq/Cargo.toml

@@ -2,7 +2,7 @@
 name = "uniq"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uniq"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "uniq"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/unlink/Cargo.toml

@@ -2,7 +2,7 @@
 name = "unlink"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_unlink"
@@ -15,4 +15,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "unlink"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/uptime/Cargo.toml

@@ -2,7 +2,7 @@
 name = "uptime"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uptime"
@@ -18,4 +18,4 @@ features = ["utmpx"]
 
 [[bin]]
 name = "uptime"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/users/Cargo.toml

@@ -2,7 +2,7 @@
 name = "users"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_users"
@@ -17,4 +17,4 @@ version = "0.0.1"
 
 [[bin]]
 name = "users"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/wc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "wc"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_wc"
@@ -14,4 +14,4 @@ uucore = "0.0.1"
 
 [[bin]]
 name = "wc"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/who/Cargo.toml

@@ -2,7 +2,7 @@
 name = "who"
 version = "0.0.1"
 authors = []
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_who"
@@ -18,4 +18,4 @@ optional = true
 
 [[bin]]
 name = "who"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/whoami/Cargo.toml

@@ -3,7 +3,7 @@ name = "whoami"
 version = "0.0.1"
 authors = []
 description = "Print effective user ID."
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_whoami"
@@ -20,4 +20,4 @@ features = ["entries", "wide"]
 
 [[bin]]
 name = "whoami"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"

src/yes/Cargo.toml

@@ -3,7 +3,7 @@ name = "yes"
 version = "0.0.1"
 authors = []
 description = "Repeatedly output a line with all specified STRING(s), or 'y'."
-build = "../../mkmain.rs"
+build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_yes"
@@ -19,4 +19,4 @@ default = []
 
 [[bin]]
 name = "yes"
-path = "../../uumain.rs"
+path = "../#common/uumain.rs"