From ad4397e99b45a2ad2b655d17ab85ff2194913692 Mon Sep 17 00:00:00 2001 From: xpamych Date: Mon, 5 Dec 2022 12:08:13 +0300 Subject: [PATCH 1/3] fix deps --- portproton/lure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portproton/lure.sh b/portproton/lure.sh index 8b9376f..7ccdfeb 100644 --- a/portproton/lure.sh +++ b/portproton/lure.sh @@ -8,14 +8,14 @@ licenses='MIT' provides='portproton' conflicts='portproton' -deps_redos=('bubblewrap' 'cabextract' 'curl' 'icoutils' 'vulkan-loader' 'vulkan-loader.i686' 'vulkan-tools' 'wget' 'zenity' 'zstd') +deps_redos=('bubblewrap' 'cabextract' 'curl' 'icoutils' 'vulkan-loader' 'vulkan-loader.(x86-32)' 'vulkan-tools' 'wget' 'zenity' 'zstd') deps_arch=('bash' 'icoutils' 'wget' 'bubblewrap' 'zstd' 'cabextract' 'bc' 'tar' 'openssl' 'gamemode' 'desktop-file-utils'\ 'curl' 'dbus' 'freetype2' 'gdk-pixbuf2' 'ttf-font' 'zenity' 'lsb-release' 'nss' 'xorg-xrandr' 'vulkan-driver' 'vulkan-icd-loader'\ 'lsof' 'lib32-freetype2' 'lib32-libgl' 'lib32-gcc-libs' 'lib32-libx11' 'lib32-libxss' 'lib32-alsa-plugins' 'lib32-libgpg-error' \ 'lib32-nss' 'lib32-vulkan-driver' 'lib32-vulkan-icd-loader' 'lib32-gamemode' 'lib32-openssl') deps_debian=('curl' 'zenity' 'cabextract' 'bubblewrap' 'gamemode' 'icoutils' 'tar' 'wget' 'zstd' 'libvulkan1') deps_fedora=('curl' 'gamemode' 'icoutils' 'libcurl' 'wget' 'zenity' 'bubblewrap' 'zstd' 'cabextract' 'tar' 'goverlay' 'openssl'\ - 'vulkan-loader.i686' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers.i686' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers.i686') + 'vulkan-loader.(x86-32)' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers.(x86-32)' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers.(x86-32)') sources=( "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/portwine_install_script/PortProton_1.0" "git+https://github.com/Castro-Fidel/PortProton_PKGBUILD.git" From cdc3cc8ad41a27fe65012a1df67ebce5a625006c Mon Sep 17 00:00:00 2001 From: xpamych Date: Mon, 5 Dec 2022 12:10:09 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9=2032=20=D0=B1=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portproton/lure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portproton/lure.sh b/portproton/lure.sh index 7ccdfeb..8bc1794 100644 --- a/portproton/lure.sh +++ b/portproton/lure.sh @@ -8,14 +8,14 @@ licenses='MIT' provides='portproton' conflicts='portproton' -deps_redos=('bubblewrap' 'cabextract' 'curl' 'icoutils' 'vulkan-loader' 'vulkan-loader.(x86-32)' 'vulkan-tools' 'wget' 'zenity' 'zstd') +deps_redos=('bubblewrap' 'cabextract' 'curl' 'icoutils' 'vulkan-loader' 'vulkan-loader(x86-32)' 'vulkan-tools' 'wget' 'zenity' 'zstd') deps_arch=('bash' 'icoutils' 'wget' 'bubblewrap' 'zstd' 'cabextract' 'bc' 'tar' 'openssl' 'gamemode' 'desktop-file-utils'\ 'curl' 'dbus' 'freetype2' 'gdk-pixbuf2' 'ttf-font' 'zenity' 'lsb-release' 'nss' 'xorg-xrandr' 'vulkan-driver' 'vulkan-icd-loader'\ 'lsof' 'lib32-freetype2' 'lib32-libgl' 'lib32-gcc-libs' 'lib32-libx11' 'lib32-libxss' 'lib32-alsa-plugins' 'lib32-libgpg-error' \ 'lib32-nss' 'lib32-vulkan-driver' 'lib32-vulkan-icd-loader' 'lib32-gamemode' 'lib32-openssl') deps_debian=('curl' 'zenity' 'cabextract' 'bubblewrap' 'gamemode' 'icoutils' 'tar' 'wget' 'zstd' 'libvulkan1') deps_fedora=('curl' 'gamemode' 'icoutils' 'libcurl' 'wget' 'zenity' 'bubblewrap' 'zstd' 'cabextract' 'tar' 'goverlay' 'openssl'\ - 'vulkan-loader.(x86-32)' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers.(x86-32)' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers.(x86-32)') + 'vulkan-loader(x86-32)' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers(x86-32)' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers(x86-32)') sources=( "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/portwine_install_script/PortProton_1.0" "git+https://github.com/Castro-Fidel/PortProton_PKGBUILD.git" From 3953d6d322911228e94c18a0b003df8822f950b3 Mon Sep 17 00:00:00 2001 From: xpamych Date: Mon, 5 Dec 2022 12:29:32 +0300 Subject: [PATCH 3/3] shfmt --- portproton/lure.sh | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/portproton/lure.sh b/portproton/lure.sh index 8bc1794..d4ef969 100644 --- a/portproton/lure.sh +++ b/portproton/lure.sh @@ -10,21 +10,21 @@ conflicts='portproton' deps_redos=('bubblewrap' 'cabextract' 'curl' 'icoutils' 'vulkan-loader' 'vulkan-loader(x86-32)' 'vulkan-tools' 'wget' 'zenity' 'zstd') deps_arch=('bash' 'icoutils' 'wget' 'bubblewrap' 'zstd' 'cabextract' 'bc' 'tar' 'openssl' 'gamemode' 'desktop-file-utils'\ -'curl' 'dbus' 'freetype2' 'gdk-pixbuf2' 'ttf-font' 'zenity' 'lsb-release' 'nss' 'xorg-xrandr' 'vulkan-driver' 'vulkan-icd-loader'\ -'lsof' 'lib32-freetype2' 'lib32-libgl' 'lib32-gcc-libs' 'lib32-libx11' 'lib32-libxss' 'lib32-alsa-plugins' 'lib32-libgpg-error' \ -'lib32-nss' 'lib32-vulkan-driver' 'lib32-vulkan-icd-loader' 'lib32-gamemode' 'lib32-openssl') + 'curl' 'dbus' 'freetype2' 'gdk-pixbuf2' 'ttf-font' 'zenity' 'lsb-release' 'nss' 'xorg-xrandr' 'vulkan-driver' 'vulkan-icd-loader'\ + 'lsof' 'lib32-freetype2' 'lib32-libgl' 'lib32-gcc-libs' 'lib32-libx11' 'lib32-libxss' 'lib32-alsa-plugins' 'lib32-libgpg-error' + 'lib32-nss' 'lib32-vulkan-driver' 'lib32-vulkan-icd-loader' 'lib32-gamemode' 'lib32-openssl') deps_debian=('curl' 'zenity' 'cabextract' 'bubblewrap' 'gamemode' 'icoutils' 'tar' 'wget' 'zstd' 'libvulkan1') -deps_fedora=('curl' 'gamemode' 'icoutils' 'libcurl' 'wget' 'zenity' 'bubblewrap' 'zstd' 'cabextract' 'tar' 'goverlay' 'openssl'\ - 'vulkan-loader(x86-32)' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers(x86-32)' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers(x86-32)') +deps_fedora=('curl' 'gamemode' 'icoutils' 'libcurl' 'wget' 'zenity' 'bubblewrap' 'zstd' 'cabextract' 'tar' 'goverlay' 'openssl' + 'vulkan-loader(x86-32)' 'vulkan-loader' 'mesa-vulkan-drivers' 'mesa-vulkan-drivers(x86-32)' 'mesa-libGL' 'mesa-dri-drivers' 'mesa-dri-drivers(x86-32)') sources=( -"https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/portwine_install_script/PortProton_1.0" -"git+https://github.com/Castro-Fidel/PortProton_PKGBUILD.git" + "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/portwine_install_script/PortProton_1.0" + "git+https://github.com/Castro-Fidel/PortProton_PKGBUILD.git" ) checksums=( -'SKIP' -'SKIP' -'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' ) #scripts=( @@ -32,21 +32,21 @@ checksums=( #) prepare() { -cd "${srcdir}" -if grep -q ID=debian "/etc/os-release"; then -sudo dpkg --add-architecture i386 -sudo apt-get install libvulkan1:i386 -sudo apt-get update -elif grep -q ID=fedora "/etc/os-release"; then -sudo dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm -sudo dnf update -sudo dnf upgrade --refresh -fi + cd "${srcdir}" + if grep -q ID=debian "/etc/os-release"; then + sudo dpkg --add-architecture i386 + sudo apt-get install libvulkan1:i386 + sudo apt-get update + elif grep -q ID=fedora "/etc/os-release"; then + sudo dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm + sudo dnf update + sudo dnf upgrade --refresh + fi } package() { -install -Dm755 "PortProton_${version}" "${pkgdir}/usr/bin/${name}" -install -Dm644 "./PortProton_PKGBUILD/${name}.desktop" -t "${pkgdir}/usr/share/applications/" -install -Dm644 "./PortProton_PKGBUILD/${name}.png" -t "${pkgdir}/usr/share/pixmaps" -install -Dm644 "./PortProton_PKGBUILD/LICENSE" -t "${pkgdir}/usr/share/licenses/${name}/" + install -Dm755 "PortProton_${version}" "${pkgdir}/usr/bin/${name}" + install -Dm644 "./PortProton_PKGBUILD/${name}.desktop" -t "${pkgdir}/usr/share/applications/" + install -Dm644 "./PortProton_PKGBUILD/${name}.png" -t "${pkgdir}/usr/share/pixmaps" + install -Dm644 "./PortProton_PKGBUILD/LICENSE" -t "${pkgdir}/usr/share/licenses/${name}/" }