Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions commandLine/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ void recursiveUpdate(const fs::path & path, ofTargetPlatform target) {
}

fs::path ofCalcPath = fs::weakly_canonical(fs::current_path() / ofPath);

for (auto & path : folders) {
// cout << "------" << endl;
// cout << path << endl;
Expand Down Expand Up @@ -434,7 +434,7 @@ int main(int argc, char** argv){
of::priv::initutils();
startTime = ofGetElapsedTimef();
consoleSpace();

// try to get the OF_PATH as an environt variable
char* pPath;
pPath = getenv("PG_OF_PATH");
Expand All @@ -446,14 +446,14 @@ int main(int argc, char** argv){
busingEnvVar = true;
ofPath = ofPathEnv;
}

fs::path projectPath = fs::weakly_canonical(fs::current_path() / projectName);
if (!fs::exists(projectPath)) {
mode = PG_MODE_CREATE;
// FIXME: Maybe it is best not to create anything here, unless specified by parameter
if (!fs::exists(projectPath.parent_path())) {
consoleSpace();
ofLog() << "Folder doesn't exist " << projectPath.parent_path() << endl;
ofLogError() << "Folder doesn't exist " << projectPath.parent_path() << endl;
consoleSpace();
return EXIT_USAGE;

Expand All @@ -479,14 +479,14 @@ int main(int argc, char** argv){
if (!isGoodOFPath(ofPath)) {
return EXIT_USAGE;
}

// alert ("ofPath before " + ofPath.string());
// alert ("projectPath " + projectPath.string());
if (ofPath.is_relative()) {
ofPath = fs::canonical(fs::current_path() / ofPath);
// alert ("ofPath canonical " + ofPath.string());
}

if (ofIsPathInPath(projectPath, ofPath)) {
ofPath = fs::relative(ofPath, projectPath);
}
Expand Down