diff --git a/app/build.gradle b/app/build.gradle
index 0593ef575..8482f9bc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -106,10 +106,9 @@ task buildVTL(type: Exec) {
     dependsOn 'exportDex'
     workingDir(projectDir.parentFile)
     if (Os.isFamily("unix") || Os.isFamily("mac")) {
-        commandLine './build.sh'
+        commandLine 'bash', '-c','./scripts/build.sh'
     } else {
-        // ugly workaround for https://github.com/gradle/gradle/issues/18716
-        commandLine 'cmd','/C','start','""','cmd','/K','".\\scripts\\build.bat && exit"'
+        commandLine 'cmd','/C', '.\\scripts\\build.bat'
     }
 }
 
diff --git a/scripts/build.bat b/scripts/build.bat
index af1b74bfe..494c21331 100644
--- a/scripts/build.bat
+++ b/scripts/build.bat
@@ -19,7 +19,7 @@ if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
     echo %ESC%[31mFailed%ESC%[0m
-    call :pauseThenExit
+    exit /B 1
 )
 
 echo.
@@ -52,7 +52,7 @@ if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
     echo %ESC%[31mFailed%ESC%[0m
-    call :pauseThenExit
+    exit /B 1
 )
 del classes6.dex
 del classes8.dex
@@ -66,7 +66,7 @@ if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
     echo %ESC%[31mFailed%ESC%[0m
-    call :pauseThenExit
+    exit /B 1
 )
 
 :setESC
@@ -75,7 +75,3 @@ for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1)
   exit /B 0
 )
 exit
-
-:pauseThenExit
-pause
-Exit /B 1
\ No newline at end of file