From f768dacbdb148a9c4e846d7b113d9aea37d563c5 Mon Sep 17 00:00:00 2001
From: Michael Gattozzi <mgattozzi@gmail.com>
Date: Thu, 2 Jan 2020 11:18:35 -0500
Subject: Cleanup ds install and format hooked properly

This cleans up the ds install command to use namespaced folders on
digital ocean to hold assets. This will make it easier to install things
in the future if we break it down by version, but really it just makes
it easier to not have to do weird splitting logic to choose the right
tool and download and install it. For some reason hooked was also not
formatted properly when rustfmt was run on OSX so this was fixed to
make the build not break.
---
 hooked/src/main.rs |  6 +++---
 src/main.rs        | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/hooked/src/main.rs b/hooked/src/main.rs
index 1c8388e..573061c 100644
--- a/hooked/src/main.rs
+++ b/hooked/src/main.rs
@@ -121,7 +121,7 @@ fn init(lang: Language) -> Result<()> {
           wrapper.write_all(
             format!(
               "#!C:\\Program Files\\Git\\bin\\sh.exe\n\
-              bash.exe .dev-suite/hooked/{}.sh\n",
+               bash.exe .dev-suite/hooked/{}.sh\n",
               hook
             )
             .as_bytes(),
@@ -132,7 +132,7 @@ fn init(lang: Language) -> Result<()> {
           wrapper.write_all(
             format!(
               "#!C:\\Program Files\\Git\\bin\\sh.exe\n\
-              py.exe .dev-suite/hooked/{}.py\n",
+               py.exe .dev-suite/hooked/{}.py\n",
               hook
             )
             .as_bytes(),
@@ -143,7 +143,7 @@ fn init(lang: Language) -> Result<()> {
           wrapper.write_all(
             format!(
               "#!C:\\Program Files\\Git\\bin\\sh.exe\n\
-              ruby.exe .dev-suite/hooked/{}.rb\n",
+               ruby.exe .dev-suite/hooked/{}.rb\n",
               hook
             )
             .as_bytes(),
diff --git a/src/main.rs b/src/main.rs
index dc94d00..6830599 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -149,15 +149,17 @@ enum Tools {
 
 /// Install all of dev-suite
 fn install() -> Result<()> {
-  static BASE_URL: &str =
-    "https://dev-suite-spaces.nyc3.digitaloceanspaces.com/";
-
   #[cfg(target_os = "macos")]
-  static TOOLS: [&str; 2] = ["hooked_osx", "ticket_osx"];
+  static BASE_URL: &str =
+    "https://dev-suite-spaces.nyc3.digitaloceanspaces.com/osx/";
   #[cfg(target_os = "linux")]
-  static TOOLS: [&str; 2] = ["hooked_linux", "ticket_linux"];
+  static BASE_URL: &str =
+    "https://dev-suite-spaces.nyc3.digitaloceanspaces.com/linux/";
   #[cfg(target_os = "windows")]
-  static TOOLS: [&str; 2] = ["hooked_windows", "ticket_windows"];
+  static BASE_URL: &str =
+    "https://dev-suite-spaces.nyc3.digitaloceanspaces.com/windows/";
+
+  static TOOLS: [&str; 2] = ["hooked", "ticket"];
 
   #[cfg(target_os = "macos")]
   let mut location = PathBuf::from("/usr/local/bin");
@@ -170,13 +172,12 @@ fn install() -> Result<()> {
   create_dir_all(&location)?;
 
   for tool in &TOOLS {
-    let tool_name = tool.split('_').nth(0).unwrap();
-    location.push(tool_name);
+    location.push(tool);
     if location.exists() {
-      println!("{} already exists, skipping", tool_name);
+      println!("{} already exists, skipping", tool);
       let _ = location.pop();
     } else {
-      println!("Installing {}", tool_name);
+      println!("Installing {}", tool);
       let url = BASE_URL.to_owned() + tool;
       let mut program = client.get(&url).send()?;
 
-- 
cgit v1.2.3