dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ExecShell: Don't DetailPrint default/empty verb as a single space

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6481 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-05-13 19:33:07 +00:00
parent dc64d4f0ca
commit 3eaff17d36
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/script.cpp
View file

@ -4189,10 +4189,11 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_EXECSHELL: // this uses improvements of Andras Varga case TOK_EXECSHELL: // this uses improvements of Andras Varga
#ifdef NSIS_SUPPORT_SHELLEXECUTE #ifdef NSIS_SUPPORT_SHELLEXECUTE
{ {
const TCHAR *verb=line.gettoken_str(1), *file=line.gettoken_str(2), *params=line.gettoken_str(3);
ent.which=EW_SHELLEXEC; ent.which=EW_SHELLEXEC;
ent.offsets[0]=add_string(line.gettoken_str(1)); ent.offsets[0]=add_string(verb);
ent.offsets[1]=add_string(line.gettoken_str(2)); ent.offsets[1]=add_string(file);
ent.offsets[2]=add_string(line.gettoken_str(3)); ent.offsets[2]=add_string(params);
ent.offsets[3]=SW_SHOWNORMAL; ent.offsets[3]=SW_SHOWNORMAL;
if (line.getnumtokens() > 4) if (line.getnumtokens() > 4)
{ {
@ -4201,11 +4202,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (a < 0) PRINTHELP() if (a < 0) PRINTHELP()
ent.offsets[3]=tab[a]; ent.offsets[3]=tab[a];
} }
tstring detail=tstring(line.gettoken_str(1))+_T(" ")+tstring(line.gettoken_str(2)); tstring detail=tstring(verb)+(_T(" ")+!*verb)+tstring(file);
ent.offsets[5]=add_string(detail.c_str()); ent.offsets[5]=add_string(detail.c_str());
SCRIPT_MSG(_T("ExecShell: %") NPRIs _T(": \"%") NPRIs _T("\" \"%") NPRIs _T("\" %") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2), SCRIPT_MSG(_T("ExecShell: %") NPRIs _T(": \"%") NPRIs _T("\" \"%") NPRIs _T("\" %") NPRIs _T("\n"),verb,file,params,line.gettoken_str(4));
line.gettoken_str(3),line.gettoken_str(4));
DefineInnerLangString(NLF_EXEC_SHELL); DefineInnerLangString(NLF_EXEC_SHELL);
} }
return add_entry(&ent); return add_entry(&ent);