diff options
| author | David Herman <davidherman@google.com> | 2015-08-04 09:34:32 -0700 |
|---|---|---|
| committer | David Herman <davidherman@google.com> | 2015-08-04 09:41:06 -0700 |
| commit | 20e2f46588296c7047c5a6bb51fb19ac6d622089 (patch) | |
| tree | eb5e157dac1966c3eeb2c32a7640e5ce577a7e76 | |
| parent | 98c998386e34d956b4ab6ab92b313039cb522f93 (diff) | |
| download | swt-20e2f46588296c7047c5a6bb51fb19ac6d622089.tar.gz | |
Android.bat: Quoted copy args
Various directory args passed to copy contain a tmp_dir variable
which, depending on the user's machine, may have spaces. Quoting the
argument should protect against copy errors. It certainly doesn't
hurt anything.
Change-Id: I7db098b467daa0bfc2ad2e2e53b08257d0627dd9
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat index 8690b77..b28eef0 100755 --- a/sdkmanager/app/etc/android.bat +++ b/sdkmanager/app/etc/android.bat @@ -48,20 +48,20 @@ for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set swt_path= set tmp_dir=%TEMP%\temp-android-tool
xcopy "%swt_path%" "%tmp_dir%\%swt_path%" /I /E /C /G /R /Y /Q > nul
- copy /B /D /Y lib\common.jar %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\commons-codec* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\commons-compress* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\commons-logging* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\dvlib.jar %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\gson* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\guava* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\httpclient* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\httpcore* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\httpmime* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\layoutlib-api.jar %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\org-eclipse-* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\sdk* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\swtmenubar.jar %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\common.jar "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\commons-codec* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\commons-compress* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\commons-logging* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\dvlib.jar "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\gson* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\guava* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\httpclient* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\httpcore* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\httpmime* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\layoutlib-api.jar "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\org-eclipse-* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\sdk* "%tmp_dir%\lib\" > nul
+ copy /B /D /Y lib\swtmenubar.jar "%tmp_dir%\lib\" > nul
rem jar_path and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
set tools_dir=%cd%
|