Befator-Inc-Firmen-Netzwerk/msys2-launcher
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSYSTEM variable detection

Browse Source
This commit is contained in:
David Macek 2015-10-29 18:09:58 +01:00
parent afa868fd7b
commit 551bb174b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher.c
View File

@ -11,7 +11,7 @@
#include "macros.h" #include "macros.h"
// if any of the properties change, it's best to use a brand new AppID // if any of the properties change, it's best to use a brand new AppID
#define APPID_REVISION 8 #define APPID_REVISION 9
static void ShowError(const wchar_t* desc, const wchar_t* err, const long code) { static void ShowError(const wchar_t* desc, const wchar_t* err, const long code) {
wchar_t msg[1024]; wchar_t msg[1024];
@ -97,7 +97,7 @@ static wchar_t* SetEnv(wchar_t* conffile) {
if (tmp != NULL) { if (tmp != NULL) {
*tmp = L'\0'; *tmp = L'\0';
if (0 == wcscmp(L"MSYSTEM", buf)) { if (0 == wcscmp(L"MSYSTEM", buf)) {
msystem = _wcsdup(buf); msystem = _wcsdup(tmp + 1);
if (msystem == NULL) { if (msystem == NULL) {
ShowError(L"Could not duplicate string", buf, 0); ShowError(L"Could not duplicate string", buf, 0);
return NULL; return NULL;
@ -212,7 +212,7 @@ int wmain(int argc, wchar_t* argv[]) {
ShowError(L"Could not allocate memory", L"", 0); ShowError(L"Could not allocate memory", L"", 0);
return __LINE__; return __LINE__;
} }
code = swprintf(buf, buflen, L"%s/usr/bin/mintty.exe -i '%s' -o 'AppLaunchCmd=%s' -o 'AppID=MSYS2.Shell.%s.%d' -o 'AppName=MSYS2 %s Shell' --store-taskbar-properties -- /usr/bin/bash --login %s %s", msysdir, exepath, exepath, STRINGIFY_W(MSYSTEM), APPID_REVISION, STRINGIFY_W(MSYSTEM), argc == 1 ? L"-i" : L"-c '$0 \"$@\"'", args); code = swprintf(buf, buflen, L"%s/usr/bin/mintty.exe -i '%s' -o 'AppLaunchCmd=%s' -o 'AppID=MSYS2.Shell.%s.%d' -o 'AppName=MSYS2 %s Shell' --store-taskbar-properties -- /usr/bin/bash --login %s %s", msysdir, exepath, exepath, msystem, APPID_REVISION, msystem, argc == 1 ? L"-i" : L"-c '$0 \"$@\"'", args);
buflen *= 2; buflen *= 2;
} }
if (code < 0) { if (code < 0) {