summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rwxr-xr-xconfig/dependencies/fedora382
-rwxr-xr-xconfig/dependencies/fedora402
-rwxr-xr-xconfig/dependencies/fedora412
-rw-r--r--config/dependencies/parabola4
-rw-r--r--config/dependencies/void2
-rw-r--r--include/vendor.sh3
7 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index a4dbea58..28671db8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@
*.tar.*
/m
/f
+/r
+/e
diff --git a/config/dependencies/fedora38 b/config/dependencies/fedora38
index dbd79329..8f672205 100755
--- a/config/dependencies/fedora38
+++ b/config/dependencies/fedora38
@@ -8,5 +8,5 @@ innoextract intltool libftdi-devel libselinux-devel libusb1 libusb1-devel \
nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \
pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \
python3-setuptools rsync sharutils subversion texinfo unar unifont \
-unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel ccache swig geteltorito mtools \
+unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel ccache swig \
"
diff --git a/config/dependencies/fedora40 b/config/dependencies/fedora40
index 32526752..6836b57b 100755
--- a/config/dependencies/fedora40
+++ b/config/dependencies/fedora40
@@ -9,5 +9,5 @@ libselinux-devel libusb1 libusb1-devel nasm ncurses-devel openssl-devel \
p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts \
-unifont-ttf-fonts unzip wget xz zlib-devel ccache swig python3-devel geteltorito mtools \
+unifont-ttf-fonts unzip wget xz zlib-devel ccache swig python3-devel \
"
diff --git a/config/dependencies/fedora41 b/config/dependencies/fedora41
index e051c665..0650ba8e 100755
--- a/config/dependencies/fedora41
+++ b/config/dependencies/fedora41
@@ -9,5 +9,5 @@ libselinux-devel libusb1 libusb1-devel nasm ncurses-devel openssl-devel openssl-
p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts \
-unifont-ttf-fonts unzip wget xz zlib-devel ccache swig python3-devel mtools geteltorito mtools \
+unifont-ttf-fonts unzip wget xz zlib-devel ccache swig python3-devel \
"
diff --git a/config/dependencies/parabola b/config/dependencies/parabola
index d62caf21..f598e491 100644
--- a/config/dependencies/parabola
+++ b/config/dependencies/parabola
@@ -7,7 +7,7 @@ help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \
ncurses openssl p7zip \
pandoc parted pciutils perl perl-libwww python python-setuptools rsync \
sharutils subversion swig texinfo ttf-dejavu unarchiver unifont-utils unzip \
-wget xz zlib ccache mtools \
+wget xz zlib ccache \
"
-aur_notice="cross-mipsel-linux-gnu-binutils cross-mipsel-linux-gnu-gcc geteltorito"
+aur_notice="cross-mipsel-linux-gnu-binutils cross-mipsel-linux-gnu-gcc"
diff --git a/config/dependencies/void b/config/dependencies/void
index 44a5676b..5eb65d14 100644
--- a/config/dependencies/void
+++ b/config/dependencies/void
@@ -8,5 +8,5 @@ freetype freetype-devel fuse gawk gcc-ada gdb gettext gettext-devel git \
help2man innoextract libftdi1 libpciaccess libusb nasm ncurses \
ncurses-devel openssl openssl-devel p7zip parted pciutils perl perl-LWP \
python python3 python3-setuptools rsync sharutils subversion texinfo \
-unar unzip wget xz zlib ccache geteltorito mtools
+unar unzip wget xz zlib ccache \
"
diff --git a/include/vendor.sh b/include/vendor.sh
index 165b9a96..570048e2 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -181,8 +181,7 @@ apply_me11_deguard_mod()
extract_archive()
{
- geteltorito "$1" > "$2/vendor.img" || \
- innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
+ innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
"$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
[ ! -d "${_dl}_extracted" ] || cp -R "${_dl}_extracted" "$2" || \