X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;fp=src%2FMain.cc;h=6914c97df3525ed8ce7b7d206f8ee0b5c3598720;hp=6cdadaf23ff4e8087845e697ea2120233a906bbc;hb=51069fee9139ab8d14ecc80dffbe5deecb73d9e0;hpb=bc795376d093ee097040f029b891b5435eb3bd21

diff --git a/src/Main.cc b/src/Main.cc
index 6cdadaf..6914c97 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -9,7 +9,7 @@
 *
 **************************************************************************/
 
-#include "../config.h"
+#include "config.h"
 
 #include <cstdlib>		// atexit
 #include <exception>
@@ -106,10 +106,8 @@ std::string Main::getSearchPath()
 	// 1. YOINK_DATADIR (environment)
 	// 2. YOINK_DATADIR (configure)
 	
-	std::string			path;
-	stlplus::env_vector	environment;
-
-	std::string datadir = environment["YOINK_DATADIR"];
+	std::string path;
+	std::string datadir = stlplus::env_vector()["YOINK_DATADIR"];
 	if (!datadir.empty())
 	{
 		path += datadir;
@@ -128,17 +126,14 @@ std::string Main::getConfigPath()
 	// 3. $HOME/.yoinkrc
 	// 4. YOINKRC (environment)
 
-	std::string path("yoinkrc");
-	moof::resource::find(path);
-
-	stlplus::env_vector environment;
+	std::string path = moof::resource::find_file("yoinkrc");
 
 #if !defined(_WIN32)
 	path += ":/etc/yoinkrc";
 #endif
 	path += ":$HOME/.yoinkrc";
 
-	std::string rc_file = environment["YOINKRC"];
+	std::string rc_file = stlplus::env_vector()["YOINKRC"];
 	if (!rc_file.empty())
 	{
 		path += ":";
@@ -221,7 +216,7 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
 			  << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-			  << "      Version: "VERSION << std::endl
+			  << "      Version: "PACKAGE_VERSION << std::endl
 			  << "        Built: " << COMPILE_TIME << std::endl
 			  << "     Compiler: "COMPILER_STRING << std::endl
 			  << "       Assets: " << assets << std::endl
@@ -312,7 +307,7 @@ int main(int argc, char* argv[])
 	try
 	{
 		std::string iconPath(PACKAGE".png");
-		moof::resource::find(iconPath);
+		iconPath = moof::resource::find_file(iconPath);
 		moof::image icon(iconPath);
 		icon.set_as_icon();