Fix a bug with getting the current directory name.

Divoolej · Feb 8, 2019 · 95446ae · 95446ae
1 parent 88a1149
commit 95446ae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "picobu"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Wojciech Olejnik <divoolej@gmail.com>"]
 readme = "README.md"
 categories = ["command-line-utilities", "development-tools::build-utils", "filesystem", "game-engines"]

diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ Picobu uses a sensible-defaults, zero-configuration approach. You can use it by
 ### Installation
 
 #### Cross-platform
+<<<<<<< Updated upstream
 The easiest way to install Picobu on any OS is by using [cargo](https://www.rust-lang.org/tools/install):
 ```fish
 ❯ cargo install picobu

diff --git a/src/main.rs b/src/main.rs
@@ -87,8 +87,8 @@ fn check_output_file(output: &Option<PathBuf>) -> PathBuf {
       }
     }
     if outputs.len() == 0 {
-      let dir = Path::new(".").to_str().unwrap();
-      let dir = format!("{}.p8", dir);
+      let dir = Path::new("./").canonicalize().unwrap();
+      let dir = format!("{}.p8", dir.file_name().unwrap().to_str().unwrap());
       println!("No *.p8 files found, generating a new one using the current directory's name ({})..", dir);
       fs::File::create(&dir).unwrap();
       return Path::new(&dir).to_path_buf();