diff --git a/README.md b/README.md index 0c4ed0f..41101f8 100644 --- a/README.md +++ b/README.md @@ -22,19 +22,19 @@ A Script to... * `adb shell` will connect to the running AVD ### Use Case Examples #### on MacOS - + #### BlueStacks 4 on MacOS - + #### on Windows - + #### on Linux - + #### Fake Boot.img on MacOS - + ### How to Install ADB (Android SDK Platform-Tools) * Open Android Studio -> SDK Manager -> Android SDK -> SDK Tools -> Check on **Android SDK Platform-Tools** -> Apply @@ -373,6 +373,9 @@ rootAVD.bat system-images\android-25\google_apis_playstore\armeabi-v7a\ramdisk.i ### Change Logs +#### [Novemver 2023] +* [rootAVD.bat] - Fixed another space issue + #### [October 2023] * [General] - Moved to GitLab diff --git a/rootAVD.bat b/rootAVD.bat index 439b9f6..040e375 100644 --- a/rootAVD.bat +++ b/rootAVD.bat @@ -137,11 +137,11 @@ IF "%ERRORLEVEL%"=="0" ( IF NOT %DEBUG% ( IF %RAMDISKIMG% ( call :pullfromAVD ramdiskpatched4AVD.img "%AVDPATHWITHRDFFILE%" - call :pullfromAVD Magisk.apk %ROOTAVD%\Apps\ + call :pullfromAVD Magisk.apk "%ROOTAVD%" Apps call :pullfromAVD Magisk.zip IF %InstallPrebuiltKernelModules% ( - call :pullfromAVD %BZFILE% + call :pullfromAVD "%BZFILE%" call :InstallKernelModules ) @@ -215,6 +215,7 @@ exit /B 0 SetLocal EnableDelayedExpansion set SRC=%1 set DST=%2 + set DST2=%3 set ADBPULLECHO= setlocal enableDelayedExpansion @@ -229,7 +230,16 @@ exit /B 0 set "DST=%%~nxi" ) - adb pull %ADBBASEDIR%/%SRC% %2 > tmpFile 2>&1 + IF NOT "%DST2%"=="" ( + adb pull %ADBBASEDIR%/%SRC% %DST2% > tmpFile 2>&1 + set "DST=%DST2%" + )ELSE ( + IF "%DST%"=="" ( + adb pull %ADBBASEDIR%/%SRC% > tmpFile 2>&1 + ) + adb pull %ADBBASEDIR%/%SRC% %2 > tmpFile 2>&1 + ) + set /P ADBPULLECHO=