Merge branch 'master' of git.tar.black:crystal/programs/jade

README.md

@@ -50,11 +50,6 @@ jade genfstab
 jade locale colemak Europe/Berlin "en_US.UTF-8 UTF-8"
 ```
 
-### create /etc/hosts
-```sh
-jade networking --hosts
-```
-
 ### configue network settings
 ```sh
 # set the hostname to getcryst.al with ipv6 disabled

src/main.rs

@@ -93,12 +93,6 @@ fn main() {
                         .help("The hostname to use")
                         .required(true),
                 )
-                .arg(
-                    Arg::with_name("create-hosts")
-                        .help("create /etc/hosts")
-                        .long("hosts")
-                        .takes_value(false),
-                )
                 .arg(
                     Arg::with_name("ipv6")
                         .help("Wether ipv6 should be enabled")
@@ -165,21 +159,19 @@ fn main() {
             app.is_present("efi"),
         );
     } else if let Some(app) = app.subcommand_matches("locale") {
-        let kbrlayout = app.value_of("keyboard").unwrap();
-        let timezn = app.value_of("timezone").unwrap();
         locale::set_locale(
             app.values_of("locales")
                 .unwrap()
                 .collect::<Vec<&str>>()
                 .join(" "),
         );
-        locale::set_keyboard(kbrlayout);
+        locale::set_keyboard(app.value_of("keyboard").unwrap());
-        locale::set_timezone(timezn);
+        locale::set_timezone(app.value_of("timezone").unwrap());
     } else if let Some(app) = app.subcommand_matches("networking") {
         if app.is_present("ipv6") {
+            network::create_hosts();
             network::enable_ipv6()
-        }
+        } else {
-        if app.is_present("create-hosts") {
             network::create_hosts()
         }
         network::set_hostname(app.value_of("hostname").unwrap())