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

converted RMDir back from SHFileOperation to the good old manual method

Browse source 
- RMDir can now be used with both /r and /REBOOTOK
- RMDir /r no longer leaves lots of files behind if one file removal failed
- The plug-ins directory is now always deleted, if not immediately, then after reboot
- RMDir /r prints a detailed log of its actions


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3597 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-08-06 17:03:07 +00:00
parent 7270abe8d3
commit 010dc75a71
8 changed files with 141 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Source/script.cpp
View file

@ -3929,7 +3929,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (!stricmp(line.gettoken_str(a),"/REBOOTOK"))
{
a++;
ent.offsets[1]=1;
ent.offsets[1]=DEL_REBOOT;
#ifndef NSIS_SUPPORT_MOVEONREBOOT
ERROR_MSG("Error: /REBOOTOK specified, NSIS_SUPPORT_MOVEONREBOOT not defined\n");
PRINTHELP()
@ -3958,23 +3958,37 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
int a=1;
ent.which=EW_RMDIR;
if (!stricmp(line.gettoken_str(1),"/r"))
ent.offsets[1]=DEL_DIR;
while (line.gettoken_str(a)[0]=='/')
{
if (line.getnumtokens() < 3) PRINTHELP()
a++;
ent.offsets[1]=1;
if (!stricmp(line.gettoken_str(a),"/r"))
{
if (a == 3) PRINTHELP();
a++;
ent.offsets[1]|=DEL_RECURSE;
}
else if (!stricmp(line.gettoken_str(a),"/REBOOTOK"))
{
if (a == 3) PRINTHELP();
a++;
ent.offsets[1]|=DEL_REBOOT;
}
else PRINTHELP();
}
else if (!stricmp(line.gettoken_str(1),"/REBOOTOK"))
{
if (line.getnumtokens() < 3) PRINTHELP()
a++;
ent.offsets[1]=2;
}
else if (line.gettoken_str(1)[0]=='/') PRINTHELP()
if (a < line.getnumtokens() - 1) PRINTHELP();
ent.offsets[0]=add_string(line.gettoken_str(a));
SCRIPT_MSG("RMDir: %s%s\"%s\"\n",a==1?"":line.gettoken_str(1),ent.offsets[1]?" ":"",line.gettoken_str(a));
SCRIPT_MSG("RMDir: ");
if (a>1)
SCRIPT_MSG("%s ",line.gettoken_str(1));
if (a>2)
SCRIPT_MSG("%s ",line.gettoken_str(2));
SCRIPT_MSG("\"%s\"\n",line.gettoken_str(a));
DefineInnerLangString(NLF_REMOVE_DIR);
DefineInnerLangString(NLF_DEL_FILE);
#ifdef NSIS_SUPPORT_MOVEONREBOOT
DefineInnerLangString(NLF_DEL_ON_REBOOT);
#endif
}
return add_entry(&ent);
#else//!NSIS_SUPPORT_RMDIR