hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-21 03:36:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup old modules and create more focused code

Browse source
This commit is contained in:
Lucien Greathouse 2018-11-16 23:27:19 -08:00
parent e09d23d6c2
commit b4fd2e31b3
9 changed files with 46 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/src/bin.rs
View file

@ -4,10 +4,20 @@ extern crate env_logger;
extern crate librojo;
use std::path::{Path, PathBuf};
use std::process;
use std::{
path::{Path, PathBuf},
process,
env,
};
use librojo::pathext::canonicalish;
fn make_path_absolute(value: &Path) -> PathBuf {
if value.is_absolute() {
PathBuf::from(value)
} else {
let current_dir = env::current_dir().unwrap();
current_dir.join(value)
}
}
fn main() {
env_logger::Builder::from_default_env()
@ -36,7 +46,7 @@ fn main() {
("init", sub_matches) => {
let sub_matches = sub_matches.unwrap();
let project_path = Path::new(sub_matches.value_of("PATH").unwrap_or("."));
let full_path = canonicalish(project_path);
let full_path = make_path_absolute(project_path);
librojo::commands::init(&full_path);
},
@ -44,7 +54,7 @@ fn main() {
let sub_matches = sub_matches.unwrap();
let project_path = match sub_matches.value_of("PROJECT") {
Some(v) => canonicalish(PathBuf::from(v)),
Some(v) => make_path_absolute(Path::new(v)),
None => std::env::current_dir().unwrap(),
};