Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
18f35daf
Commit
18f35daf
authored
Jan 29, 2021
by
longpanda
Browse files
Update CI
parent
519fac71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
10 deletions
+16
-10
INSTALL/ventoy_pack.sh
INSTALL/ventoy_pack.sh
+3
-3
LiveCD/livecd.sh
LiveCD/livecd.sh
+13
-7
No files found.
INSTALL/ventoy_pack.sh
View file @
18f35daf
#!/bin/sh
#!/bin/sh
if
[
"
$1
"
=
"CI"
]
;
then
if
[
"
$1
"
=
"CI"
]
;
then
OPT
=
''
OPT
=
'
-dR
'
else
else
OPT
=
'-a'
OPT
=
'-a'
fi
fi
...
@@ -140,10 +140,10 @@ rm -rf $tmpdir
...
@@ -140,10 +140,10 @@ rm -rf $tmpdir
cd
../LiveCD
cd
../LiveCD
if
[
"
$1
"
=
"CI"
]
;
then
if
[
"
$1
"
=
"CI"
]
;
then
echo
"=============== run docker_ci.sh ==============="
echo
"=============== run docker_ci.sh ==============="
sh docker_ci.sh
sh docker_ci.sh
$1
fi
fi
echo
"=============== run livecd.sh ==============="
echo
"=============== run livecd.sh ==============="
sh livecd.sh
sh livecd.sh
$1
cd
$CurDir
cd
$CurDir
mv
../LiveCD/ventoy
*
.iso ./
mv
../LiveCD/ventoy
*
.iso ./
...
...
LiveCD/livecd.sh
View file @
18f35daf
#!/bin/bash
#!/bin/bash
if
[
"
$1
"
=
"CI"
]
;
then
OPT
=
'-dR'
else
OPT
=
'-a'
fi
VENTOY_PATH
=
$PWD
/../
VENTOY_PATH
=
$PWD
/../
if
!
[
-f
$VENTOY_PATH
/INSTALL/grub/grub.cfg
]
;
then
if
!
[
-f
$VENTOY_PATH
/INSTALL/grub/grub.cfg
]
;
then
...
@@ -15,9 +21,9 @@ if ! [ -e $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ]; then
...
@@ -15,9 +21,9 @@ if ! [ -e $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ]; then
fi
fi
rm
-rf
ISO_TMP
rm
-rf
ISO_TMP
cp
-a
ISO ISO_TMP
cp
$OPT
ISO ISO_TMP
cp
-a
VTOY VTOY_TMP
cp
$OPT
VTOY VTOY_TMP
ls
-la
ls
-la
if
!
[
-d
ISO_TMP
]
;
then
if
!
[
-d
ISO_TMP
]
;
then
...
@@ -39,9 +45,9 @@ find . | cpio -o -H newc | gzip -c -9 > ../ISO_TMP/EFI/ventoy/ventoy.gz
...
@@ -39,9 +45,9 @@ find . | cpio -o -H newc | gzip -c -9 > ../ISO_TMP/EFI/ventoy/ventoy.gz
cd
..
&&
rm
-rf
VTOY_TMP
cd
..
&&
rm
-rf
VTOY_TMP
cp
-a
$VENTOY_PATH
/INSTALL/ventoy-
${
version
}
-linux
.tar.gz ISO_TMP/EFI/ventoy/
cp
$OPT
$VENTOY_PATH
/INSTALL/ventoy-
${
version
}
-linux
.tar.gz ISO_TMP/EFI/ventoy/
cp
-a
GRUB/cdrom.img ISO_TMP/EFI/boot/
cp
$OPT
GRUB/cdrom.img ISO_TMP/EFI/boot/
cp
-a
GRUB/bootx64.efi ISO_TMP/EFI/boot/
cp
$OPT
GRUB/bootx64.efi ISO_TMP/EFI/boot/
rm
-rf
efimnt
rm
-rf
efimnt
...
@@ -52,11 +58,11 @@ dd if=/dev/zero of=efi.img bs=1M count=2
...
@@ -52,11 +58,11 @@ dd if=/dev/zero of=efi.img bs=1M count=2
mkfs.vfat efi.img
mkfs.vfat efi.img
mount efi.img efimnt
mount efi.img efimnt
mkdir
-p
efimnt/EFI/boot
mkdir
-p
efimnt/EFI/boot
cp
-a
GRUB/bootx64.efi efimnt/EFI/boot/
cp
$OPT
GRUB/bootx64.efi efimnt/EFI/boot/
umount efimnt
umount efimnt
sync
sync
cp
-a
efi.img ISO_TMP/EFI/boot/
cp
$OPT
efi.img ISO_TMP/EFI/boot/
rm
-rf
efimnt
rm
-rf
efimnt
rm
-f
efi.img
rm
-f
efi.img
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment