fix: path

.gitignore

@@ -1,4 +1,4 @@
-oxido
+oxido*
 target
 Cargo.lock
 bin

README.md

@@ -22,8 +22,8 @@ wget https://github.com/oxidite/oxup/releases/latest/download/oxup-linux.tar.gz
 tar -xf oxup-linux.tar.gz
 mkdir $HOME/.oxido
 mv oxup $HOME/.oxido
-export PATH=$PATH:$HOME/.oxido
-echo "export PATH=$PATH:$HOME/.oxido" >> $HOME/.bashrc
+export PATH="$HOME/.oxido:$PATH"
+echo "export PATH="$HOME/.oxido:$PATH"" >> $HOME/.bashrc
 ```
 
 ### Macos
@@ -33,8 +33,8 @@ wget https://github.com/oxidite/oxup/releases/latest/download/oxup-darwin.zip
 unzip oxup-darwin.zip
 mkdir $HOME/.oxido
 mv oxup $HOME/.oxido
-export PATH=$PATH:$HOME/.oxido
-echo "export PATH=$PATH:$HOME/.oxido" >> $HOME/.bashrc
+export PATH="$HOME/.oxido:$PATH"
+echo "export PATH="$HOME/.oxido:$PATH"" >> $HOME/.bashrc
 ```
 
 ## Usage

src/installers/linux.rs

@@ -1,31 +1,34 @@
+use crate::{shell_command};
 use regex::Regex;
-use crate::{shell_command, current_shell};
 
 pub fn install_l() {
-
     let mut s = shell_command(
         "curl",
-        vec![
-            "https://api.github.com/repositories/500013933/releases/latest",
-        ],
+        vec!["https://api.github.com/repositories/500013933/releases/latest"],
     );
 
     let re = Regex::new("\"browser_download_url\":.\"(?P<url>.*tar.gz)\"").unwrap();
 
-    s = re.captures(&s).unwrap().name("url").unwrap().as_str().to_string();
+    s = re
+        .captures(&s)
+        .unwrap()
+        .name("url")
+        .unwrap()
+        .as_str()
+        .to_string();
+
+    println!("Downloading release from {}...", &s);
 
     shell_command("wget", vec![&s]);
 
+    println!("Unpacking release...");
+
     shell_command("tar", vec!["-xf", "oxido*.tar.gz"]);
 
+    println!("Moving to $HOME/.oxido...");
+
     shell_command("mkdir", vec!["$HOME/.oxido"]);
     shell_command("mv", vec!["oxido* $HOME/.oxido"]);
-    shell_command("export", vec!["PATH:$HOME/.oxido"]);
-
-    if current_shell() == "bash" {
-        shell_command("echo", vec!["\"export PATH:$HOME/.oxido\" >> $HOME/.bashrc"]);
-    } else if current_shell() == "zsh" {
-        shell_command("echo", vec!["\"export PATH:$HOME/.oxido\" >> $HOME/.zshrc"]);
-    } 
-
-}
+
+    println!("Oxup installed successfully!\nRun echo \"export PATH=\"$HOME/.oxido:$PATH\"\" >> $HOME/.bashrc and restart your terminal to use it");
+}

src/installers/macos.rs

@@ -1,4 +1,4 @@
-use crate::{shell_command, current_shell};
+use crate::{shell_command};
 use regex::Regex;
 
 pub fn install_m() {
@@ -17,17 +17,18 @@ pub fn install_m() {
         .as_str()
         .to_string();
 
+    println!("Downloading release from {}...", &s);
+
     shell_command("wget", vec![&s]);
 
+    println!("Unpacking release...");
+
     shell_command("unzip", vec!["oxido*.darwin.zip"]);
 
+    println!("Moving to $HOME/.oxido...");
+
     shell_command("mkdir", vec!["$HOME/.oxido"]);
     shell_command("mv", vec!["oxido* $HOME/.oxido"]);
-    shell_command("export", vec!["PATH:$HOME/.oxido"]);
 
-    if current_shell() == "bash" {
-        shell_command("echo", vec!["\"export PATH:$HOME/.oxido\" >> $HOME/.bashrc"]);
-    } else if current_shell() == "zsh" {
-        shell_command("echo", vec!["\"export PATH:$HOME/.oxido\" >> $HOME/.zshrc"]);
-    } 
+    println!("Oxup installed successfully!\nRun echo \"export PATH=\"$HOME/.oxido:$PATH\"\" >> $HOME/.bashrc and restart your terminal to use it");
 }

src/installers/mod.rs

@@ -1,3 +1,3 @@
 pub mod linux;
-pub mod macos; 
-pub mod windows;
+pub mod macos;
+pub mod windows;

src/installers/windows.rs

@@ -5,14 +5,18 @@ use crate::shell_command;
 pub fn install_w() {
     let mut s = shell_command(
         "curl",
-        vec![
-            "https://api.github.com/repositories/500013933/releases/latest",
-        ],
+        vec!["https://api.github.com/repositories/500013933/releases/latest"],
     );
 
     let re = Regex::new("\"browser_download_url\":.\"(?P<url>.*gnu.zip)\"").unwrap();
 
-    s = re.captures(&s).unwrap().name("url").unwrap().as_str().to_string();
+    s = re
+        .captures(&s)
+        .unwrap()
+        .name("url")
+        .unwrap()
+        .as_str()
+        .to_string();
 
     shell_command("wget", vec![&s]);
 
@@ -21,6 +25,6 @@ pub fn install_w() {
     shell_command("mkdir", vec![r"C:\bin"]);
 
     shell_command("move", vec![r"oxido.exe C:\oxido"]);
-    
+
     shell_command("setx", vec!["PATH \"C:\\oxido;%PATH%\""]);
-}
+}

src/main.rs

@@ -1,7 +1,7 @@
 mod installers;
 mod uninstallers;
 
-use uninstallers::{windows::uninstall_w, linux::uninstall_l, macos::uninstall_m};
+use uninstallers::{linux::uninstall_l, macos::uninstall_m, windows::uninstall_w};
 
 use crate::installers::{linux::install_l, macos::install_m, windows::install_w};
 use std::{
@@ -34,7 +34,6 @@ const VERSION: &str = "v1.0.0";
 fn main() {
     let args: Vec<String> = args().collect();
 
-
     if args.len() == 1 {
         println!("oxup: missing overand\n{}", HELP_MESSAGE);
         std::process::exit(1)
@@ -59,8 +58,7 @@ fn main() {
                 "macos" => install_m(),
                 _ => install_l(),
             }
-            println!("OK");
-        },
+        }
         "uninstall" => {
             let mut os = OS;
             if args.contains(&String::from("-L")) {
@@ -76,8 +74,7 @@ fn main() {
                 "macos" => uninstall_m(),
                 _ => uninstall_l(),
             }
-            println!("OK")
-        },
+        }
         "version" => println!("{}", VERSION),
         _ => {
             println!("oxup: missing overand\n{}", HELP_MESSAGE);
@@ -89,7 +86,3 @@ fn main() {
 fn shell_command(name: &str, args: Vec<&str>) -> String {
     String::from_utf8(Command::new(name).args(args).output().unwrap().stdout).unwrap()
 }
-
-fn current_shell() -> String {
-    shell_command("echo", vec!["$SHELL"]).split("/").last().unwrap().to_string()
-}

src/uninstallers/linux.rs

@@ -2,4 +2,4 @@ use crate::shell_command;
 
 pub fn uninstall_l() {
     shell_command("rm", vec!["-rf", "$HOME/.oxido/oxido"]);
-}
+}

src/uninstallers/macos.rs

@@ -2,4 +2,4 @@ use crate::shell_command;
 
 pub fn uninstall_m() {
     shell_command("rm", vec!["-rf", "$HOME/.oxido/oxido"]);
-}
+}

src/uninstallers/mod.rs

@@ -1,3 +1,3 @@
 pub mod linux;
-pub mod macos; 
-pub mod windows;
+pub mod macos;
+pub mod windows;

src/uninstallers/windows.rs

@@ -2,4 +2,4 @@ use crate::shell_command;
 
 pub fn uninstall_w() {
     shell_command("rm", vec![r"C:\bin\oxido"]);
-}
+}