Fix update, add vim template, version bump to 0.5

zakkor · Aug 25, 2016 · 49c4711 · 49c4711
1 parent 8a4a275
commit 49c4711
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/.conf b/.conf
@@ -159,8 +159,16 @@
 	        "config",
 		"~/.config/lemonbuddy/"
 	    ]
+	},
+	"vim": {
+	    "deps": [
+	        "vim"
+	    ],
+	    "Default": [
+	        ".vimrc",
+		"~/"
+	    ]
 	}
-
     },
     "groups": {
         "i3": [

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ricem"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["ed <edward.partenie@gmail.com>"]
 
 [dependencies]

diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ or
 
 `ricem edit <template name>` to open a file in your editor (specified by $VISUAL). Example: `ricem edit rc.xml` will open `~/.config/openbox/rc.xml`
 
-`ricem update` will download the latest version of `.conf` that contains the latest templates directly from this github repo. <b>(Unstable and replaces your current .conf file which contains your themes)</b>
+`ricem update` will download the latest version of `.conf` that contains the latest templates directly from this github repo.
 
 ## Obtaining
 #### Dependencies:

diff --git a/src/main.rs b/src/main.rs
@@ -27,7 +27,7 @@ use std::io::*;
 use std::path::Path;
 
 
-const VERSION: f32 = 0.4;
+const VERSION: f32 = 0.5;
 
 fn select_theme(name: String, themes: &Vec<Theme>, json_util: &JsonUtil) -> Option<String> {
     let mut json_obj = json_util.read();
@@ -526,7 +526,16 @@ fn main() {
 
             },
             "update" | "upd" => {
-                exec_shell_with_output("wget https://raw.githubusercontent.com/zakkor/ricem/master/.conf -O ~/.ricem/.conf");
+                exec_shell("mkdir ~/.ricem/temp");
+                exec_shell_with_output("wget https://raw.githubusercontent.com/zakkor/ricem/master/.conf -O ~/.ricem/temp/.conf");
+                let temp_conf_path = ricem_dir.join("temp").join(".conf");
+
+                let mut temp_json_obj = JsonUtil::new(&temp_conf_path).read();
+                let mut json_obj = json_util.read();
+
+                json_obj["templates"] = temp_json_obj["templates"].take();
+                json_util.write(&json_obj);
+                exec_shell("rm -rf ~/.ricem/temp");
             },
             _ => {
                 println!("Error: Unknown command.");