}\r
\r
TCHAR *oldpath,*home;\r
- size_t size;\r
+ size_t homesize,size;\r
\r
// set HOME if not set already\r
- _tgetenv_s(&size, NULL, 0, _T("HOME"));\r
- if (!size)\r
+ _tgetenv_s(&homesize, NULL, 0, _T("HOME"));\r
+ if (!homesize)\r
{\r
_tdupenv_s(&home,&size,_T("USERPROFILE")); \r
_tputenv_s(_T("HOME"),home);\r
free(home);\r
}\r
+ CString str;\r
\r
+#ifndef _TORTOISESHELL\r
//setup ssh client\r
CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
\r
// add git/bin path to PATH\r
\r
CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
- CString str=msysdir;\r
+ str=msysdir;\r
if(str.IsEmpty())\r
{\r
CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
return false;\r
}\r
}\r
+#endif\r
//CGit::m_MsysGitPath=str;\r
\r
//set path\r
l_processEnv = GetEnvironmentStrings();\r
// updated environment is now duplicated for use in CreateProcess, restore original PATH for current process\r
_tputenv_s(_T("PATH"),sOldPath);\r
+ if(!homesize)\r
+ {\r
+ _tputenv_s(_T("HOME"),_T(""));\r
+ }\r
#endif\r
\r
bInitialized = TRUE;\r
<Include Id="VersionNumberInclude">\r
<?define MajorVersion="0" ?>\r
<?define MinorVersion="7" ?>\r
- <?define MicroVersion="1" ?>\r
+ <?define MicroVersion="2" ?>\r
<?define BuildVersion="0" ?>\r
</Include>\r
-#define FILEVER 0,7,1,0\r
-#define PRODUCTVER 0,7,1,0\r
-#define STRFILEVER "0, 7, 1, 0\0"\r
-#define STRPRODUCTVER "0, 7, 1, 0\0"\r
+#define FILEVER 0,7,2,0\r
+#define PRODUCTVER 0,7,2,0\r
+#define STRFILEVER "0, 7, 2, 0\0"\r
+#define STRPRODUCTVER "0, 7, 2, 0\0"\r
\r
#define TSVN_VERMAJOR 0\r
-#define TSVN_VERMINOR 6\r
-#define TSVN_VERMICRO 1\r
+#define TSVN_VERMINOR 7\r
+#define TSVN_VERMICRO 2\r
#define TSVN_VERBUILD 0\r
#define TSVN_VERDATE "date unknown\n"\r
\r