Update CI

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 5614fdfd2d8a60373b23b854064be047146e6499..3e62539a4e06dd0321e6bc92b848819f1acbca96 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ "$1" = "CI" ]; then
 #!/bin/sh
 
 if [ "$1" = "CI" ]; then

-    OPT=''
+    OPT='-dR'

 else
     OPT='-a'
 fi
 else
     OPT='-a'
 fi


@@ -140,10 +140,10 @@ rm -rf $tmpdir
 cd ../LiveCD
 if [ "$1" = "CI" ]; then
     echo "=============== run docker_ci.sh ==============="
 cd ../LiveCD
 if [ "$1" = "CI" ]; then
     echo "=============== run docker_ci.sh ==============="

-    sh docker_ci.sh
+    sh docker_ci.sh $1

 fi
 echo "=============== run livecd.sh ==============="
 fi
 echo "=============== run livecd.sh ==============="

-sh livecd.sh
+sh livecd.sh $1

 cd $CurDir
 
 mv ../LiveCD/ventoy*.iso ./
 cd $CurDir
 
 mv ../LiveCD/ventoy*.iso ./

diff --git a/LiveCD/livecd.sh b/LiveCD/livecd.sh
index 5bb8fc590e42ec2c9fd8bb4f8971589fbf4f3028..75c74bdc4783d1d2c6957b73f0e4d12664ba9a50 100644 (file)
--- a/LiveCD/livecd.sh
+++ b/LiveCD/livecd.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
 #!/bin/bash
 

+if [ "$1" = "CI" ]; then
+    OPT='-dR'
+else
+    OPT='-a'
+fi
+

 VENTOY_PATH=$PWD/../
 
 if ! [ -f $VENTOY_PATH/INSTALL/grub/grub.cfg ]; then
 VENTOY_PATH=$PWD/../
 
 if ! [ -f $VENTOY_PATH/INSTALL/grub/grub.cfg ]; then


@@ -15,9 +21,9 @@ if ! [ -e $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ]; then
 fi
 
 rm -rf ISO_TMP
 fi
 
 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
 if ! [ -d ISO_TMP ]; then
 
 ls -la
 if ! [ -d ISO_TMP ]; then


@@ -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 -a GRUB/cdrom.img ISO_TMP/EFI/boot/
-cp -a GRUB/bootx64.efi ISO_TMP/EFI/boot/
+cp $OPT $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ISO_TMP/EFI/ventoy/
+cp $OPT GRUB/cdrom.img 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
 mkfs.vfat efi.img
 mount efi.img efimnt
 mkdir -p efimnt/EFI/boot
 mkfs.vfat efi.img
 mount efi.img efimnt
 mkdir -p efimnt/EFI/boot

-cp -a GRUB/bootx64.efi efimnt/EFI/boot/
+cp $OPT GRUB/bootx64.efi efimnt/EFI/boot/

 umount efimnt
 
 sync
 umount efimnt
 
 sync

-cp -a efi.img ISO_TMP/EFI/boot/
+cp $OPT efi.img ISO_TMP/EFI/boot/

 
 rm -rf efimnt
 rm -f efi.img
 
 rm -rf efimnt
 rm -f efi.img