mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
fix for bug #34089 - customizations werent makeing it in because there were spaces in the directory name - fixed it by appending the quotes before and after the directory name
This commit is contained in:
parent
5d44d8e64d
commit
2d4f930492
@ -334,7 +334,9 @@ BOOL CInterpret::OpenBrowser(const char *url)
|
||||
*pos = '\0'; /* remove the parameter */
|
||||
|
||||
lstrcat(pos," ");
|
||||
lstrcat(pos,"\"");
|
||||
lstrcat(pos,url);
|
||||
lstrcat(pos,"\"");
|
||||
ExecuteCommand(key,SW_SHOW,50);
|
||||
retflag = TRUE;
|
||||
}
|
||||
@ -375,7 +377,9 @@ BOOL CInterpret::OpenViewer(const char *url)
|
||||
*pos = '\0'; /* remove the parameter */
|
||||
|
||||
lstrcat(pos," ");
|
||||
lstrcat(pos,"\"");
|
||||
lstrcat(pos,url);
|
||||
lstrcat(pos,"\"");
|
||||
ExecuteCommand(key,SW_SHOW,50);
|
||||
retflag = TRUE;
|
||||
}
|
||||
|
@ -34,6 +34,8 @@ int xpiLen = -1;
|
||||
// Setup Sections for config.ini
|
||||
CString Setup0Short = "&Typical";
|
||||
CString Setup1Short = "C&ustom";
|
||||
CString quotes = "\"";
|
||||
CString spaces = " ";
|
||||
|
||||
COMPONENT Components[100];
|
||||
int numComponents;
|
||||
@ -67,7 +69,7 @@ int ExtractXPIFile(CString xpiname, CString xpifile)
|
||||
|
||||
// Can use -d instead of change CWD???
|
||||
CString xpiArchive = nscpxpiPath + "\\" + xpiname;
|
||||
command = rootPath + "unzip.exe -o" + " " + xpiArchive + " " + xpifile;
|
||||
command = quotes +rootPath + "unzip.exe"+ quotes + "-o" + spaces + quotes + xpiArchive + quotes + spaces + quotes + xpifile + quotes;
|
||||
ExecuteCommand((char *)(LPCTSTR) command, SW_HIDE, INFINITE);
|
||||
|
||||
return TRUE;
|
||||
@ -89,7 +91,7 @@ int ReplaceXPIFiles()
|
||||
if (!CopyFile(xpiArchive, xpiArcDest, TRUE))
|
||||
DWORD e = GetLastError();
|
||||
|
||||
command = rootPath + "zip.exe -m " + xpiArcDest + " " + xpiList[i].filename;
|
||||
command = quotes + rootPath + "zip.exe" + quotes + "-m " + spaces + quotes +xpiArcDest + quotes + spaces + quotes + xpiList[i].filename + quotes;
|
||||
ExecuteCommand((char *)(LPCTSTR) command, SW_HIDE, INFINITE);
|
||||
}
|
||||
|
||||
@ -111,8 +113,7 @@ int ReplaceINIFile()
|
||||
CString Dst = xpiDstPath + "\\" + exeName;
|
||||
if (!CopyFile(Src, Dst, FALSE))
|
||||
DWORD e = GetLastError();
|
||||
|
||||
command = rootPath + "nszip.exe " + exeName + " config.ini";
|
||||
command = quotes + rootPath + "nszip.exe " + quotes + spaces + exeName + spaces + "config.ini";
|
||||
ExecuteCommand((char *)(LPCTSTR) command, SW_SHOW, INFINITE);
|
||||
|
||||
SetCurrentDirectory(olddir);
|
||||
|
Loading…
Reference in New Issue
Block a user