1.0.16 release

[Ventoy.git] / IMG / cpio / ventoy / init

diff --git a/IMG/cpio/ventoy/init b/IMG/cpio/ventoy/init
index ff64a39a544a5f98abc81718030c1b46b4b8423a..ad5ac3a9ef149d8569a39017646f920a420ac22e 100644 (file)
--- a/IMG/cpio/ventoy/init
+++ b/IMG/cpio/ventoy/init
@@ -186,21 +186,31 @@ fi
 # Step 3 : Extract injection archive                               #
 #                                                                  #
 ####################################################################
 # Step 3 : Extract injection archive                               #
 #                                                                  #
 ####################################################################

-if [ -e $VTOY_PATH/ventoy_injection ]; then
-    echo "decompress injection ..." >>$VTLOG
-    
+ventoy_unpack_injection() {

     vtmagic=$(hexdump -n 2 -e '2/1 "%02X"' $VTOY_PATH/ventoy_injection)
     vtmagic=$(hexdump -n 2 -e '2/1 "%02X"' $VTOY_PATH/ventoy_injection)

-    echo "vtmagic=$vtmagic ..." >>$VTLOG
+    echo "ventoy_unpack_injection  vtmagic=$vtmagic ..."

     
     

-    if [ "1F8B" = "vtmagic" ] || [ "1F9E" = "vtmagic" ]; then
-        zcat $VTOY_PATH/ventoy_injection | tar -xf -C /
-    elif [ "425A" = "vtmagic" ]; then
-        bzcat $VTOY_PATH/ventoy_injection | tar -xf -C /
-    elif [ "FD37" = "vtmagic" ]; then
-        xzcat $VTOY_PATH/ventoy_injection | tar -xf -C /
+    if [ "1F8B" = "$vtmagic" ] || [ "1F9E" = "$vtmagic" ]; then
+        echo "tar.gz  tar -xzvf"
+        tar -xzvf $VTOY_PATH/ventoy_injection -C /
+    elif [ "425A" = "$vtmagic" ]; then
+        echo "tar.bz2  tar -xjvf"
+        tar -xjvf $VTOY_PATH/ventoy_injection -C / 
+    elif [ "FD37" = "$vtmagic" ]; then
+        echo "tar.xz  tar -xJvf"
+        tar -xJvf $VTOY_PATH/ventoy_injection -C /
+    elif [ "5D00" = "$vtmagic" ]; then
+        echo "tar.lzma  tar -xavf"
+        tar -xavf $VTOY_PATH/ventoy_injection -C /

     else
     else

-        unzip -o -q $VTOY_PATH/ventoy_injection -d /
+        echo "unzip -o"
+        unzip -o $VTOY_PATH/ventoy_injection -d /

     fi
     fi

+}
+
+if [ -e $VTOY_PATH/ventoy_injection ]; then
+    echo "### decompress injection ... ###" >>$VTLOG
+    ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1

 fi
 
 
 fi