OSX: Guess actual executable from the app bundle directory

FossilOrigin-Name: 7988e53166771ea71d916a1ab714eb671d07dea8

manifest

@@ -1,5 +1,5 @@
-C Disabled\sautomatically\sadding\sFossil's\sremote-url\sto\sthe\slist\sof\sremotes.
-D 2015-08-22T17:05:26.921
+C OSX:\sGuess\sactual\sexecutable\sfrom\sthe\sapp\sbundle\sdirectory
+D 2015-08-22T17:32:24.250
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -243,7 +243,7 @@ F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f
 F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055
 F src/SettingsDialog.cpp fa0c70eaf0fa7edb15de302d041cdb552fe523d5
 F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd
-F src/Utils.cpp 8c810dbd77274e791b2e9a642da9f160346d1559
+F src/Utils.cpp cfadf3ee981f5ead8635c395610421f8e04a9a42
 F src/Utils.h c6341ee49a8fc35f215facb196d70bf9b1f2fc0f
 F src/Workspace.cpp c46aeb616712e42dcee72774a572af3a9803dbf1
 F src/Workspace.h 54eef32658b13a34fe78ae26887420e8ff358eaa
@@ -260,7 +260,7 @@ F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
-P aea2b8b8985d6b40aff4b53eeaa485702c674658
-R dad90d72bf773e880e746c76c86cfa5e
+P cb27c4e2a0777b5c3fa64a07d19cd6b89e05c76f
+R 19ead9c938bef0606914a30fe37378b3
 U kostas
-Z 0fe28fd959c0f01fed99428467c68f06
+Z 6b9bc678ab29fb68e3f8be6bb65cb34f

manifest.uuid

@@ -1 +1 @@
-cb27c4e2a0777b5c3fa64a07d19cd6b89e05c76f
+7988e53166771ea71d916a1ab714eb671d07dea8

src/Utils.cpp

@@ -54,6 +54,18 @@ QString SelectExe(QWidget *parent, const QString &description)
 	if(!QFile::exists(path))
 		return QString();
 
+#ifdef Q_OS_MACX
+	// Guess actual executable from bundle dir
+	QFileInfo fi(path);
+	if(fi.isDir() && path.indexOf(".app")!=-1)
+	{
+		path += "/Contents/MacOS/" + fi.baseName();
+
+		if(!QFile::exists(path))
+			return QString();
+	}
+#endif
+
 	return path;
 }
 //-----------------------------------------------------------------------------