Skip to content

Commit 5ac8081

Browse files
authored
Improvements to batch script
1 parent 865f4e1 commit 5ac8081

1 file changed

Lines changed: 23 additions & 12 deletions

File tree

.github/workflows/iso.bat

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,27 @@ FOR /f "tokens=1,2 delims=-" %%a IN ("%latestkver%") DO (
99

1010
SET downloads=%userprofile%\Downloads
1111

12+
ECHO.
1213
ECHO Choose the flavour of Ubuntu you wish to install:
1314
ECHO.
1415
ECHO 1. Ubuntu
1516
ECHO 2. Kubuntu
1617
ECHO 3. Ubuntu Unity
1718
ECHO.
18-
SET /P flavinput=Type your choice (1, 2 etc.) from the above list and press return.
19+
ECHO Type your choice (1, 2 etc.) from the above list and press return.
20+
SET /P flavinput=
1921

2022
IF "%flavinput%"=="1" (
2123
SET flavour=ubuntu
24+
SET flavourcap=Ubuntu
2225
) ELSE (
2326
IF "%flavinput%"=="2" (
2427
SET flavour=kubuntu
28+
SET flavourcap=Kubuntu
2529
) ELSE (
2630
IF "%flavinput%"=="3" (
2731
SET flavour=ubuntu-unity
32+
SET flavourcap=Ubuntu Unity
2833
) ELSE (
2934
ECHO Invalid input. Aborting!
3035
PAUSE
@@ -33,12 +38,14 @@ IF "%flavinput%"=="1" (
3338
)
3439
)
3540

41+
ECHO.
3642
ECHO Choose the version of Ubuntu you wish to install:
3743
ECHO.
3844
ECHO 1. 24.04 LTS - Noble Numbat
3945
ECHO 2. 25.10 - Questing Quokka
4046
ECHO.
41-
SET /P verinput=Type your choice (1 or 2) from the above list and press return.
47+
ECHO Type your choice (1 or 2) from the above list and press return.
48+
SET /P verinput=
4249

4350
IF "%verinput%"=="1" (
4451
SET iso=%flavour%-24.04-%latestkver%-t2-noble
@@ -54,13 +61,19 @@ IF "%verinput%"=="1" (
5461
)
5562
)
5663

57-
ECHO Downloading Part 1 for %flavour% %ver%
64+
ECHO.
65+
ECHO Downloading Part 1 for %flavourcap% %ver%
66+
ECHO.
5867
curl -#L https://github.com/t2linux/T2-Ubuntu/releases/download/%latest%/%iso%.iso.00 > %downloads%\%iso%.iso
5968

60-
ECHO Downloading Part 2 for %flavour% %ver%
69+
ECHO.
70+
ECHO Downloading Part 2 for %flavourcap% %ver%
71+
ECHO.
6172
curl -#L https://github.com/t2linux/T2-Ubuntu/releases/download/%latest%/%iso%.iso.01 >> %downloads%\%iso%.iso
6273

63-
ECHO Downloading Part 3 for %flavour% %ver%
74+
ECHO.
75+
ECHO Downloading Part 3 for %flavourcap% %ver%
76+
ECHO.
6477
curl -#L https://github.com/t2linux/T2-Ubuntu/releases/download/%latest%/%iso%.iso.02 >> %downloads%\%iso%.iso
6578

6679
FOR /f "tokens=1,2 delims= " %%a IN ("%ver%") DO (
@@ -81,21 +94,19 @@ FOR /f "tokens=1,2 delims= " %%a IN ("%actual_iso_chksum%") DO (
8194
SET actual_iso_chksum=%%a
8295
)
8396

97+
ECHO.
8498
ECHO Verifying sha256 checksums
8599

86100
FOR /f "tokens=1" %%i IN ('certutil -hashfile %downloads%\%iso%.iso SHA256 ^| findstr /v "hash"') DO (
87101
SET "downloaded_iso_chksum=%%i"
88102
)
89103

90-
ECHO %actual_iso_chksum%
91-
ECHO %downloaded_iso_chksum%
92-
93104
IF "%actual_iso_chksum%" NEQ "%downloaded_iso_chksum%" (
105+
ECHO.
94106
ECHO Error: Failed to verify sha256 checksums of the ISO
95-
PAUSE
107+
DEL %downloads%\%iso%.iso
96108
EXIT
97109
)
98110

99-
ECHO ISO saved successfully
100-
101-
PAUSE
111+
ECHO.
112+
ECHO ISO saved to Downloads

0 commit comments

Comments
 (0)