#199: fix issue with relative paths
Relative paths don't work with FG. Since we Linux users just love command-lines and often do use relative paths, make sure to convert them before use.
This commit is contained in:
parent
472cc02d6e
commit
6f4a090770
1 changed files with 13 additions and 11 deletions
|
@ -216,10 +216,10 @@ FGGlobals::~FGGlobals()
|
||||||
|
|
||||||
// set the fg_root path
|
// set the fg_root path
|
||||||
void FGGlobals::set_fg_root (const string &root) {
|
void FGGlobals::set_fg_root (const string &root) {
|
||||||
fg_root = root;
|
SGPath tmp(root);
|
||||||
|
fg_root = tmp.realpath();
|
||||||
|
|
||||||
// append /data to root if it exists
|
// append /data to root if it exists
|
||||||
SGPath tmp( fg_root );
|
|
||||||
tmp.append( "data" );
|
tmp.append( "data" );
|
||||||
tmp.append( "version" );
|
tmp.append( "version" );
|
||||||
if ( tmp.exists() ) {
|
if ( tmp.exists() ) {
|
||||||
|
@ -253,19 +253,20 @@ void FGGlobals::append_fg_scenery (const string &paths)
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_FOREACH(const SGPath& path, sgPathSplit( paths )) {
|
BOOST_FOREACH(const SGPath& path, sgPathSplit( paths )) {
|
||||||
if (!path.exists()) {
|
SGPath abspath(path.realpath());
|
||||||
SG_LOG(SG_GENERAL, SG_WARN, "scenery path not found:" << path.str());
|
if (!abspath.exists()) {
|
||||||
|
SG_LOG(SG_GENERAL, SG_WARN, "scenery path not found:" << abspath.str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check for duplicates
|
// check for duplicates
|
||||||
string_list::const_iterator ex = std::find(fg_scenery.begin(), fg_scenery.end(), path.str());
|
string_list::const_iterator ex = std::find(fg_scenery.begin(), fg_scenery.end(), abspath.str());
|
||||||
if (ex != fg_scenery.end()) {
|
if (ex != fg_scenery.end()) {
|
||||||
SG_LOG(SG_GENERAL, SG_INFO, "skipping duplicate add of scenery path:" << path.str());
|
SG_LOG(SG_GENERAL, SG_INFO, "skipping duplicate add of scenery path:" << abspath.str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
simgear::Dir dir(path);
|
simgear::Dir dir(abspath);
|
||||||
SGPath terrainDir(dir.file("Terrain"));
|
SGPath terrainDir(dir.file("Terrain"));
|
||||||
SGPath objectsDir(dir.file("Objects"));
|
SGPath objectsDir(dir.file("Objects"));
|
||||||
|
|
||||||
|
@ -273,7 +274,7 @@ void FGGlobals::append_fg_scenery (const string &paths)
|
||||||
// Terrain and Objects subdirs, but the conditional logic was commented
|
// Terrain and Objects subdirs, but the conditional logic was commented
|
||||||
// out, such that all three dirs are added. Unfortunately there's
|
// out, such that all three dirs are added. Unfortunately there's
|
||||||
// no information as to why the change was made.
|
// no information as to why the change was made.
|
||||||
fg_scenery.push_back(path.str());
|
fg_scenery.push_back(abspath.str());
|
||||||
|
|
||||||
if (terrainDir.exists()) {
|
if (terrainDir.exists()) {
|
||||||
fg_scenery.push_back(terrainDir.str());
|
fg_scenery.push_back(terrainDir.str());
|
||||||
|
@ -290,7 +291,7 @@ void FGGlobals::append_fg_scenery (const string &paths)
|
||||||
|
|
||||||
// make scenery dirs available to Nasal
|
// make scenery dirs available to Nasal
|
||||||
SGPropertyNode* n = sim->getChild("fg-scenery", propIndex++, true);
|
SGPropertyNode* n = sim->getChild("fg-scenery", propIndex++, true);
|
||||||
n->setStringValue(path.str());
|
n->setStringValue(abspath.str());
|
||||||
n->setAttribute(SGPropertyNode::WRITE, false);
|
n->setAttribute(SGPropertyNode::WRITE, false);
|
||||||
} // of path list iteration
|
} // of path list iteration
|
||||||
}
|
}
|
||||||
|
@ -302,15 +303,16 @@ void FGGlobals::append_aircraft_path(const std::string& path)
|
||||||
SG_LOG(SG_GENERAL, SG_WARN, "aircraft path not found:" << path);
|
SG_LOG(SG_GENERAL, SG_WARN, "aircraft path not found:" << path);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
std::string abspath = dirPath.realpath();
|
||||||
|
|
||||||
unsigned int index = fg_aircraft_dirs.size();
|
unsigned int index = fg_aircraft_dirs.size();
|
||||||
fg_aircraft_dirs.push_back(path);
|
fg_aircraft_dirs.push_back(abspath);
|
||||||
|
|
||||||
// make aircraft dirs available to Nasal
|
// make aircraft dirs available to Nasal
|
||||||
SGPropertyNode* sim = fgGetNode("/sim", true);
|
SGPropertyNode* sim = fgGetNode("/sim", true);
|
||||||
sim->removeChild("fg-aircraft", index, false);
|
sim->removeChild("fg-aircraft", index, false);
|
||||||
SGPropertyNode* n = sim->getChild("fg-aircraft", index, true);
|
SGPropertyNode* n = sim->getChild("fg-aircraft", index, true);
|
||||||
n->setStringValue(path);
|
n->setStringValue(abspath);
|
||||||
n->setAttribute(SGPropertyNode::WRITE, false);
|
n->setAttribute(SGPropertyNode::WRITE, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue