Skip to content

Commit 05f3aaf

Browse files
committed
fix some more error messages
1 parent 751a120 commit 05f3aaf

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

src/sdk.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,12 @@ fn set_sdk_path(path: PathBuf, do_move: bool) {
459459
let old = std::env::var("GEODE_SDK").map(PathBuf::from)
460460
.expect("Cannot locate SDK.");
461461

462-
assert!(old.is_dir(), "Internal Error: $GEODE_SDK doesn't point to a directory. Please reinstall the Geode SDK");
462+
assert!(old.is_dir(),
463+
"Internal Error: GEODE_SDK doesn't point to a directory ({}). This \
464+
might be caused by having run `geode sdk set-path` - try restarting \
465+
your terminal / computer, or reinstall using `geode sdk install --reinstall`",
466+
old.display()
467+
);
463468
assert!(old.join("VERSION").exists(), "Internal Error: $GEODE_SDK/VERSION not found. Please reinstall the Geode SDK.");
464469
assert!(!path.exists(), "Cannot move SDK to existing path {}", path.to_str().unwrap());
465470

src/util/config.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl Config {
140140
.borrow()
141141
}
142142

143-
pub fn try_sdk_path() -> Result<PathBuf, &'static str> {
143+
pub fn try_sdk_path() -> Result<PathBuf, String> {
144144
let sdk_var = std::env::var("GEODE_SDK")
145145
.map_err(|_|
146146
"Unable to find Geode SDK (GEODE_SDK isn't set). Please install \
@@ -152,11 +152,17 @@ impl Config {
152152

153153
let path = PathBuf::from(sdk_var);
154154
if !path.is_dir() {
155-
return Err("Internal Error: GEODE_SDK doesn't point to a directory. Fix it manually or reinstall using `geode sdk install --reinstall`");
155+
return Err(format!(
156+
"Internal Error: GEODE_SDK doesn't point to a directory ({}). This \
157+
might be caused by having run `geode sdk set-path` - try restarting \
158+
your terminal / computer, or reinstall using `geode sdk install --reinstall`",
159+
path.display()
160+
));
156161
}
157162
if !path.join("VERSION").exists() {
158163
return Err(
159-
"Internal Error: GEODE_SDK/VERSION not found. Please reinstall the Geode SDK using `geode sdk install --reinstall`"
164+
"Internal Error: GEODE_SDK/VERSION not found. Please reinstall \
165+
the Geode SDK using `geode sdk install --reinstall`".into()
160166
);
161167
}
162168

0 commit comments

Comments
 (0)