From 5e9e2e9ca8e2fcdefd4c73012b9b1802b192579c Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sat, 20 Feb 2021 14:33:37 +0100
Subject: [PATCH] Rename utils into redox-initfs-ar.

---
 Cargo.toml                                                | 2 +-
 {utils => redox-initfs-ar}/Cargo.toml                     | 7 ++-----
 .../src/main.rs                                           | 8 +++++---
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename {utils => redox-initfs-ar}/Cargo.toml (75%)
 rename utils/src/redox_initfs_package.rs => redox-initfs-ar/src/main.rs (98%)

diff --git a/Cargo.toml b/Cargo.toml
index 160d9d4358..46c5f20404 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,5 +19,5 @@ kernel = []
 
 [workspace]
 members = [
-  "utils",
+  "redox-initfs-ar",
 ]
diff --git a/utils/Cargo.toml b/redox-initfs-ar/Cargo.toml
similarity index 75%
rename from utils/Cargo.toml
rename to redox-initfs-ar/Cargo.toml
index 86f2970edf..5c149bfaf2 100644
--- a/utils/Cargo.toml
+++ b/redox-initfs-ar/Cargo.toml
@@ -1,15 +1,12 @@
 [package]
-name = "utils"
+name = "redox-initfs-ar"
 version = "0.1.0"
 authors = ["4lDO2 <4lDO2@protonmail.com>"]
 edition = "2018"
+description = "Archive a directory into a Redox initfs image"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[[bin]]
-path = "src/redox_initfs_package.rs"
-name = "redox-initfs-package"
-
 [dependencies]
 anyhow = "1"
 clap = "2.33"
diff --git a/utils/src/redox_initfs_package.rs b/redox-initfs-ar/src/main.rs
similarity index 98%
rename from utils/src/redox_initfs_package.rs
rename to redox-initfs-ar/src/main.rs
index 447b73c947..7a12caf930 100644
--- a/utils/src/redox_initfs_package.rs
+++ b/redox-initfs-ar/src/main.rs
@@ -337,15 +337,17 @@ fn allocate_contents_and_write_inodes(
 }
 
 fn main() -> Result<()> {
-    let matches = App::new("redox_initfs_package")
-        .help("Package a Redox initfs")
+    let matches = App::new(clap::crate_name!())
+        .about(clap::crate_description!())
+        .version(clap::crate_version!())
+        .author(clap::crate_authors!())
         .arg(
             Arg::with_name("MAX_SIZE")
                 .long("--max-size")
                 .short("-m")
                 .takes_value(true)
                 .required(false)
-                .help("Set the upper limit for how large the image can become (default 8 MiB)."),
+                .help("Set the upper limit for how large the image can become (default 64 MiB)."),
         )
         .arg(
             Arg::with_name("SOURCE")