Skip to content

Commit bc67a78

Browse files
authored
Updated variables manipulation
Added safe to ignore warning when creating ISO
1 parent 8568dbe commit bc67a78

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

buildgmt.cmd

+21-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ ECHO ************************************************
1313
ECHO.
1414
REM ## DEFINE VARIABLES
1515
SET errcode=0
16-
REM # URL construct
17-
SET HTTP=https://
16+
REM # URL constructor
17+
SET HTTPRequest=https://github.com/Genymobile/app/releases
1818
SET GH=github.com
1919
SET GM=Genymobile
2020
SET SC=scrcpy
2121
SET RT=gnirehtet
22-
SET GLR=releases/latest
23-
REM Fallback in case of processing latest releases fail
24-
SET SC32=%HTTP%%GH%/%GM%/%SC%/releases/download/v%SCver%/%SC%-win32-v%SCver%.zip
25-
SET SC64=%HTTP%%GH%/%GM%/%SC%/releases/download/v%SCver%/%SC%-win64-v%SCver%.zip
26-
SET RT64=%HTTP%%GH%/%GM%/%RT%/releases/download/v%SCver%/%RT%-rust-win64-v%RTver%.zip
27-
SET LGM=%HTTP%api.%GH%/repos/%GM%/app/%GLR%
22+
CALL SET LGM=%%HTTPRequest:%GH%^=api.%GH%/repos%%
23+
SET LGM=%LGM%/latest
24+
CALL SET SC32=%%HTTPRequest:%GM%^=%GM%%/SC%%%
25+
CALL SET SC32=%%SC32:app^=%SC%%%
26+
SET SC32=%SC32%/download/v%SCver%/%SC%-win32-v%SCver%.zip
27+
CALL SET SC64=%%SC32:32^=64%%
28+
SET RT64=%SC32:~0,55%v%RTver%/%RT%-rust-win64-v%RTver%.zip
29+
CALL SET RT64=%%RT64:%SC%^=%RT%%%
2830
REM # wget arguments
2931
SET WGGH=--no-check-certificate --content-disposition
3032
SET WG=-q --show-progress
@@ -34,13 +36,17 @@ SET oDIR=main\gmt\
3436
ECHO * Getting latest releases...
3537
<NUL set /p= -- %SC% x32:
3638
CALL :LatestRelease %LGM%, %SC%, 1
37-
IF NOT "%APPVer%"=="" (SET SC32=%HTTP%%GH%/%GM%/%SC%/%GLR%/download/%APPVer% & ECHO %APPVer%) ELSE (ECHO error 14, using v%SCver%...)
39+
ECHO %APPVer%
40+
IF NOT "%APPVer%"=="" (CALL SET SC32=%%HTTPRequest:app/releases^=%SC%/releases/latest/download/%APPVer%%%) ELSE (ECHO error 14, using v%SCver%...)
3841
<NUL set /p= -- %SC% x64:
3942
CALL :LatestRelease %LGM%, %SC%, 2
40-
IF NOT "%APPVer%"=="" (SET SC64=%HTTP%%GH%/%GM%/%SC%/%GLR%/download/%APPVer% & ECHO %APPVer%) ELSE (ECHO error 14, using v%SCver%...)
43+
ECHO %APPVer%
44+
IF NOT "%APPVer%"=="" (CALL SET SC64=%%SC32:32^=64%%) ELSE (ECHO error 14, using v%SCver%...)
4145
<NUL set /p= -- %RT% x64:
4246
CALL :LatestRelease %LGM%, %RT%, 3
43-
IF NOT "%APPVer%"=="" (SET RT64=%HTTP%%GH%/%GM%/%RT%/%GLR%/download/%APPVer% & ECHO %APPVer%) ELSE (ECHO error 14, using v%RTver%...)
47+
ECHO %APPVer%
48+
IF NOT "%APPVer%"=="" (CALL SET RT64=%%HTTPRequest:app/releases^=%RT%/releases/latest/download/%APPVer%%%) ELSE (ECHO error 14, using v%RTver%...)
49+
4450
ECHO * Downloading...
4551
ECHO -- %SC% x32...
4652
tools\wget.exe %WGGH% -O%oDIR%%SC%w32.zip %SC32% %WG%
@@ -63,13 +69,15 @@ IF NOT EXIST %oDIR%%RT%w64.zip (
6369
GOTO Error
6470
)
6571
ECHO.
72+
6673
ECHO -- Android Debug Bridge (ADB)...
6774
tools\wget.exe -O%oDIR%adb.zip https://dl.google.com/android/repository/platform-tools-latest-windows.zip %WG%
6875
IF NOT EXIST %oDIR%adb.zip (
6976
SET errcode = 4
7077
GOTO Error
7178
)
7279
ECHO.
80+
7381
ECHO * Updating archives...
7482
ECHO -- %SC% x32...
7583
tools\7z.exe d -bso0 %oDIR%%SC%w32.zip -ir@tools\adbfiles.lst
@@ -96,6 +104,7 @@ IF %ERRORLEVEL% NEQ 0 (
96104
GOTO Error
97105
)
98106
ECHO.
107+
99108
ECHO * Extracting files...
100109
:FindISO
101110
IF NOT EXIST original_iso\%oISO%.iso GOTO ISONFound
@@ -146,7 +155,7 @@ ECHO.
146155
ECHO * Building structure...
147156
ECHO -- Adding files...
148157
COPY tools\7z.* %oDIR% >NUL
149-
ECHO -- Creating ISO...
158+
ECHO -- Creating ISO...(safe to ignore "Warning: creating filesystem that does not conform to ISO-9660.")
150159
SET errcode = 12
151160
tools\mkisofs.exe -iso-level 2 -J -l -D -N -joliet-long -relaxed-filenames -r -V "OnePlus" -duplicates-once -quiet -o mm\system\etc\%oISO%.iso main/
152161
IF NOT EXIST mm\system\etc\%oISO%.iso GOTO Error

0 commit comments

Comments
 (0)