fixed a lot of bugs in the script

10 files changed, 209 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14e439bae7bb..95078fbb434b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,17 @@
 pkgbase = amdgpu-pro-installer-cfe
 	pkgver = 21.50_1373477
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-21-50
 	arch = x86_64
 	groups = Radeon_Software_for_Linux_Cosmic_Fusion_Edition
 	license = custom: multiple
 	makedepends = wget
-	source = GET-DEBS.sh
+	source = GET-DEBS-AMF.sh
+	source = GET-DEBS-ENC.sh
+	source = GET-DEBS-LIBGL32.sh
+	source = GET-DEBS-LIBGL.sh
+	source = GET-DEBS-VULKAN32.sh
+	source = GET-DEBS-VULKAN.sh
 	source = versions
 	source = progl
 	source = progl.bash-completion
@@ -14,15 +19,16 @@ pkgbase = amdgpu-pro-installer-cfe
 	source = provlk.bash-completion
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f
 	sha256sums = e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354
 	sha256sums = 7bb670f1588c65404ed5dc231c02c4acff4b2150c3f0eba99e052debbb089c32
 	sha256sums = 5c3f42f4c01bd0b8d1a582f6a476cc1afa4dfe47209b4742fcde84fa52d075df
 
-pkgname = libamdenc-amdgpu-pro-cfe
-	pkgdesc = AMD Encode Core Library
-	license = custom: AMDGPU-PRO EULA
-
 pkgname = amf-amdgpu-pro-cfe
 	pkgdesc = AMDGPU Pro Advanced Multimedia Framework
 	license = custom: AMDGPU-PRO EULA
@@ -33,6 +39,10 @@ pkgname = amf-amdgpu-pro-cfe
 	depends = libamdenc-amdgpu-pro-cfe
 	conflicts = amf-amdgpu-pro
 
+pkgname = libamdenc-amdgpu-pro-cfe
+	pkgdesc = AMD Encode Core Library
+	license = custom: AMDGPU-PRO EULA
+
 pkgname = amdgpu-pro-libgl-cfe
 	pkgdesc = AMDGPU Pro OpenGL driver
 	license = custom: AMDGPU-PRO EULA
diff --git a/GET-DEBS-AMF.sh b/GET-DEBS-AMF.sh
new file mode 100644
index 000000000000..ad65f26a489e
--- /dev/null
+++ b/GET-DEBS-AMF.sh
@@ -0,0 +1,22 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ###
+
+### amf-amdgpu-pro ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_${amfver_base}-${pkgver_build}_amd64.deb
+
+
+
+
diff --git a/GET-DEBS-ENC.sh b/GET-DEBS-ENC.sh
new file mode 100644
index 000000000000..f93f9ce69cd7
--- /dev/null
+++ b/GET-DEBS-ENC.sh
@@ -0,0 +1,24 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ### 
+
+### libamdenc-amdgpu-pro ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_${encver_base}-${pkgver_build}_amd64.deb
+
+
+
+
+
+
diff --git a/GET-DEBS-LIBGL.sh b/GET-DEBS-LIBGL.sh
new file mode 100644
index 000000000000..e90c73b2d4b6
--- /dev/null
+++ b/GET-DEBS-LIBGL.sh
@@ -0,0 +1,33 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ###
+
+### amdgpu-pro-libgl ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${pkgver_base}-${pkgver_build}_amd64.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${pkgver_base}-${pkgver_build}_amd64.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${pkgver_base}-${pkgver_build}_amd64.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
+
+
+
+
+
diff --git a/GET-DEBS-LIBGL32.sh b/GET-DEBS-LIBGL32.sh
new file mode 100644
index 000000000000..61f4f7740cc5
--- /dev/null
+++ b/GET-DEBS-LIBGL32.sh
@@ -0,0 +1,33 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ###
+
+### lib32-amdgpu-pro-libgl ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${pkgver_base}-${pkgver_build}_i386.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${pkgver_base}-${pkgver_build}_i386.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${pkgver_base}-${pkgver_build}_i386.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
+
+
+
+
+
diff --git a/GET-DEBS-VULKAN.sh b/GET-DEBS-VULKAN.sh
new file mode 100644
index 000000000000..9b44068fcd02
--- /dev/null
+++ b/GET-DEBS-VULKAN.sh
@@ -0,0 +1,22 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ###
+
+### vulkan-amdgpu-pro ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
+
+
+
+
diff --git a/GET-DEBS-VULKAN32.sh b/GET-DEBS-VULKAN32.sh
new file mode 100644
index 000000000000..a216df648956
--- /dev/null
+++ b/GET-DEBS-VULKAN32.sh
@@ -0,0 +1,22 @@
+
+#!/bin/bash
+
+# A script which download all required DEBS from repo.radeon.com .
+
+. ./versions
+
+### Creating Archive ###
+
+mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
+cd ${ARCHIVE}
+
+### Getting Debs ###
+
+### lib32-vulkan-amdgpu-pro ###
+
+wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
+
+
+
+
diff --git a/GET-DEBS.sh b/GET-DEBS.sh
deleted file mode 100644
index 5f6d9fc41cce..000000000000
--- a/GET-DEBS.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#!/bin/bash
-
-# A script which download all required DEBS from repo.radeon.com .
-
-. ./versions
-
-### Creating Archive ###
-
-mkdir amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
-ARCHIVE=amdgpu-pro-$pkgver_base-$pkgver_build-ubuntu-$ubuntu_ver
-cd ${ARCHIVE}
-
-### Getting Debs ###
-
-### amdgpu-pro-libgl ###
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${pkgver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${pkgver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${pkgver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
-
-### amf-amdgpu-pro ###
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_${encver_base}-${pkgver_build}_amd64.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_${amfver_base}-${pkgver_build}_amd64.deb
-
-### lib32-amdgpu-pro-libgl ###
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${pkgver_base}-${pkgver_build}_i386.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${pkgver_base}-${pkgver_build}_i386.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${pkgver_base}-${pkgver_build}_i386.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
-
-### vulkan-amdgpu-pro ###
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${pkgver_base}-${pkgver_build}_amd64.deb
-
-
-### lib32-vulkan-amdgpu-pro ###
-
-wget http://repo.radeon.com/amdgpu/${pkgver_base}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${pkgver_base}-${pkgver_build}_i386.deb
-
-
-
diff --git a/PKGBUILD b/PKGBUILD
index 18c93d463452..b92c6a9f19be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ enc_ver=1.0
 
 pkgbase=amdgpu-pro-installer-cfe
 pkgname=(
-libamdenc-amdgpu-pro-cfe
 amf-amdgpu-pro-cfe
+libamdenc-amdgpu-pro-cfe
 amdgpu-pro-libgl-cfe
 lib32-amdgpu-pro-libgl-cfe
 vulkan-amdgpu-pro-cfe
@@ -17,7 +17,7 @@ lib32-vulkan-amdgpu-pro-cfe
 )
 
 pkgver=${major}_${minor}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-21-50
 license=('custom: multiple')
@@ -26,7 +26,7 @@ makedepends=('wget')
 
 DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-21-50 -N %u'
 
-source=(GET-DEBS.sh
+source=(GET-DEBS*
         versions
         progl
         progl.bash-completion
@@ -35,15 +35,39 @@ source=(GET-DEBS.sh
 
 sha256sums=("SKIP"
             "SKIP"
+            "SKIP"
+            "SKIP"
+            "SKIP"
+            "SKIP"
+            "SKIP"
             feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f
             e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354
             7bb670f1588c65404ed5dc231c02c4acff4b2150c3f0eba99e052debbb089c32
             5c3f42f4c01bd0b8d1a582f6a476cc1afa4dfe47209b4742fcde84fa52d075df)
 
-get_debs() {
-         bash ./GET-DEBS.sh
+get_debs_amf() {
+         bash ./GET-DEBS-AMF.sh
 }
 
+get_debs_enc() {
+         bash ./GET-DEBS-ENC.sh
+}
+
+get_debs_libgl() {
+         bash ./GET-DEBS-LIBGL.sh
+}
+
+get_debs_libgl32() {
+         bash ./GET-DEBS-LIBGL32.sh
+}
+
+get_debs_vulkan() {
+         bash ./GET-DEBS-VULKAN.sh
+}
+
+get_debs_vulkan32() {
+         bash ./GET-DEBS-VULKAN32.sh
+}
 
 # extracts a debian package
 # $1: deb file to extract
@@ -87,6 +111,7 @@ package_amf-amdgpu-pro-cfe () {
     depends=("libglvnd" "libx11" "vulkan-amdgpu-pro" "rocm-opencl-runtime" "libamdenc-amdgpu-pro-cfe")
     conflicts=("amf-amdgpu-pro")
 
+    get_debs_amf
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/amf-amdgpu-pro_${amf_ver}-${minor}_amd64.deb
     move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib"
     move_copyright
@@ -96,7 +121,7 @@ package_libamdenc-amdgpu-pro-cfe () {
     pkgdesc="AMD Encode Core Library"
     license=('custom: AMDGPU-PRO EULA')
 
-    get_debs
+    get_debs_enc
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libamdenc-amdgpu-pro_${enc_ver}-${minor}_amd64.deb
     move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib"
     move_copyright
@@ -110,6 +135,7 @@ package_amdgpu-pro-libgl-cfe () {
     backup=(etc/amd/amdapfxx.blb)
     conflicts=("amdgpu-pro-libgl")
 
+    get_debs_libgl
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libegl1-amdgpu-pro_${major}-${minor}_amd64.deb
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libgl1-amdgpu-pro-dri_${major}-${minor}_amd64.deb
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libgl1-amdgpu-pro-ext_${major}-${minor}_amd64.deb
@@ -138,6 +164,7 @@ package_lib32-amdgpu-pro-libgl-cfe () {
     backup=(etc/amd/amdrc etc/ld.so.conf.d/10-amdgpu-pro-i386.conf)
     conflicts=("lib32-amdgpu-pro-libgl")
 
+    get_debs_libgl32
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libegl1-amdgpu-pro_${major}-${minor}_i386.deb
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libgl1-amdgpu-pro-dri_${major}-${minor}_i386.deb
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libgl1-amdgpu-pro-ext_${major}-${minor}_i386.deb
@@ -159,6 +186,8 @@ package_vulkan-amdgpu-pro-cfe () {
     provides=('vulkan-driver')
     depends=()
     conflicts=("vulkan-amdgpu-pro")
+
+    get_debs_vulkan
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/vulkan-amdgpu-pro_${major}-${minor}_amd64.deb
     move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib"
     move_copyright
@@ -180,6 +209,7 @@ package_lib32-vulkan-amdgpu-pro-cfe () {
     depends=()
     conflicts=("lib32-vulkan-amdgpu-pro")
 
+    get_debs_vulkan32
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/vulkan-amdgpu-pro_${major}-${minor}_i386.deb
     move_libdir "opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
     move_copyright
diff --git a/README.md b/README.md
index 3455a156f231..e4e3749394a2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ If a new update comes with new dependencies)
 This a fork maintained by 14-yrs old guy who isn't very patient nor experienced with doing this type of stuff , 
 so here's how you can help :
 1. Rewrite missing .sh and .py scripts from upstream archlinux-amdgpu-pro .
-2. When a New Update Hits repo.radeon.com update `GET-DEBS.sh` & `PKGBUILD` to support new changes
+2. When a New Update Hits repo.radeon.com update `GET-DEBS-*.sh` & `PKGBUILD` to support new changes
 and dependencies (if I didn't do so already) .
 3. Improve my scripts .