From c55aa92d4f4b2823481b2d8a31ea5aec16985ae8 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 12 Mar 2017 01:24:30 +0800 Subject: [PATCH] Update build script --- build.cmd | 20 ++++++++++---------- build.sh | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.cmd b/build.cmd index 952ff6ef2..16adf35b1 100644 --- a/build.cmd +++ b/build.cmd @@ -53,14 +53,14 @@ EXIT /B %ERRORLEVEL% ECHO ************************ ECHO * Copying binaries ECHO ************************ - COPY /Y libs\armeabi-v7a\* zip_static\arm - COPY /Y libs\arm64-v8a\* zip_static\arm64 - COPY /Y libs\x86\* zip_static\x86 - COPY /Y libs\x86_64\* zip_static\x64 - CALL :mkcp libs\armeabi-v7a\bootimgtools uninstaller\arm - CALL :mkcp libs\arm64-v8a\bootimgtools uninstaller\arm64 - CALL :mkcp libs\x86\bootimgtools uninstaller\x86 - CALL :mkcp libs\x86_64\bootimgtools uninstaller\x64 + CALL :mkcp libs\armeabi-v7a\* zip_static\arm + CALL :mkcp libs\arm64-v8a\* zip_static\arm64 + CALL :mkcp libs\x86\* zip_static\x86 + CALL :mkcp libs\x86_64\* zip_static\x64 + CALL :mkcp libs\armeabi-v7a\magiskboot uninstaller\arm + CALL :mkcp libs\arm64-v8a\magiskboot uninstaller\arm64 + CALL :mkcp libs\x86\magiskboot uninstaller\x86 + CALL :mkcp libs\x86_64\magiskboot uninstaller\x64 EXIT /B %ERRORLEVEL% :clean @@ -94,7 +94,7 @@ EXIT /B %ERRORLEVEL% CALL :usage EXIT /B %ERRORLEVEL% ) - IF NOT EXIST "zip_static\arm\bootimgtools" CALL :error "Missing binaries! Please run '%me% build' before zipping!" + IF NOT EXIST "zip_static\arm\magiskboot" CALL :error "Missing binaries! Please run '%me% build' before zipping!" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% ECHO ************************ ECHO * Adding version info @@ -124,7 +124,7 @@ EXIT /B %ERRORLEVEL% :uninstaller SET OK=y - IF NOT EXIST "uninstaller\arm\bootimgtools" CALL :error "Missing binaries! Please run '%me% build' before zipping!" + IF NOT EXIST "uninstaller\arm\magiskboot" CALL :error "Missing binaries! Please run '%me% build' before zipping!" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% ECHO ************************ ECHO * Copying Files diff --git a/build.sh b/build.sh index bb655bab0..9f41b67f4 100755 --- a/build.sh +++ b/build.sh @@ -58,17 +58,17 @@ build_bin() { echo "* Copying binaries" echo "************************" mkcp "libs/armeabi-v7a/*" zip_static/arm - mkcp libs/armeabi-v7a/bootimgtools uninstaller/arm + mkcp libs/armeabi-v7a/magiskboot uninstaller/arm mkcp "libs/arm64-v8a/*" zip_static/arm64 - mkcp libs/arm64-v8a/bootimgtools uninstaller/arm64 + mkcp libs/arm64-v8a/magiskboot uninstaller/arm64 mkcp "libs/x86/*" zip_static/x86 - mkcp libs/x86/bootimgtools uninstaller/x86 + mkcp libs/x86/magiskboot uninstaller/x86 mkcp "libs/x86_64/*" zip_static/x64 - mkcp libs/x86_64/bootimgtools uninstaller/x64 + mkcp libs/x86_64/magiskboot uninstaller/x64 } zip_package() { - [ ! -f "zip_static/arm/bootimgtools" ] && error "Missing binaries!! Please run '$0 build' before zipping" + [ ! -f "zip_static/arm/magiskboot" ] && error "Missing binaries!! Please run '$0 build' before zipping" echo "************************" echo "* Adding version info" echo "************************" @@ -98,7 +98,7 @@ zip_package() { } zip_uninstaller() { - [ ! -f "uninstaller/arm/bootimgtools" ] && error "Missing binaries!! Please run '$0 build' before zipping" + [ ! -f "uninstaller/arm/magiskboot" ] && error "Missing binaries!! Please run '$0 build' before zipping" echo "************************" echo "* Copying files" echo "************************"