bumped version and reverterd to MAINLINE

3 files changed, 53 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 242dc9753ea0..f7b7fea03748 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waydroid-image-gapps
 	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system (Android image, GAPPS).
-	pkgver = 18.1_20221030
+	pkgver = 18.1_20221109
 	pkgrel = 2
 	url = https://github.com/waydroid
 	arch = x86_64
@@ -10,21 +10,21 @@ pkgbase = waydroid-image-gapps
 	license = Apache
 	depends = waydroid
 	provides = waydroid-image
-	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-18.1-20221030-GAPPS-waydroid_x86_64-system.zip
-	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-18.1-20221105-HALIUM_11-waydroid_x86_64-vendor.zip
-	sha256sums_x86_64 = 2e96a24f2bb24d5b8dd6fe8bc04bdb2f4a467ed6784c912e806d30a161972264
-	sha256sums_x86_64 = 73aec94db726c33a32cd6b4fc3c3322c066363a8855d14f0897d66ee6540598d
-	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-18.1-20221030-GAPPS-waydroid_x86-system.zip
-	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-18.1-20221105-HALIUM_11-waydroid_x86-vendor.zip
-	sha256sums_i686 = 99ced90314088ca535c240106d15e279be73fd77d85ce73b88a5394150e12d4f
-	sha256sums_i686 = f8b8d7830690bca3d42fee8c8b305a68795014a9bc8286be4df90490104c3d08
-	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-18.1-20221030-GAPPS-waydroid_arm-system.zip
-	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-18.1-20221105-HALIUM_11-waydroid_arm-vendor.zip
-	sha256sums_armv7h = b446705b6fce430c7ec56b00516e44ab5a6045aa6f47c3b42cdfc3c3da54d520
-	sha256sums_armv7h = 9808cd679e7855aefd7e3da5e04acc6537d4640c801a8c609601a2bfaffa5942
-	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-18.1-20221030-GAPPS-waydroid_arm64-system.zip
-	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-18.1-20221105-HALIUM_11-waydroid_arm64-vendor.zip
-	sha256sums_aarch64 = be93e06b5a84e81059c2b692a80ecbf7fff4d93ff59449e7edb99d8ce53a94d5
-	sha256sums_aarch64 = 221c6271c2babd315a1fbae885107c3721a0d00d9ff955d6d331833e7535d48d
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-18.1-20221109-GAPPS-waydroid_x86_64-system.zip
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-18.1-20221109-MAINLINE-waydroid_x86_64-vendor.zip
+	sha256sums_x86_64 = 72b5b5fe3d68e5604664798044515448420ef3015e0e1ee086dbf9eb04467d95
+	sha256sums_x86_64 = 24374d6978cc4a03b1fbc4b2d11d4afa430ebd9d8f93b452481d77b7e8b7d3b6
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-18.1-20221109-GAPPS-waydroid_x86-system.zip
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-18.1-20221109-MAINLINE-waydroid_x86-vendor.zip
+	sha256sums_i686 = 82c3657d4ee058a29d64ff5561cf9613e3e3955db700815272e11917a8947efc
+	sha256sums_i686 = 37698fcce8f185baa6e4e7674a418b009d2ad6515f48e1954fa47d62a3e5dd24
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-18.1-20221110-GAPPS-waydroid_arm-system.zip
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-18.1-20221110-MAINLINE-waydroid_arm-vendor.zip
+	sha256sums_armv7h = c84602507c406958f3ac1ae8b8f84ebe23ad2162d11505363aca9763c45b8a4a
+	sha256sums_armv7h = db23686798ba272ce793e91320a4bfd77cdf9d6d6e49915d70fdedbb267c92a2
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-18.1-20221110-GAPPS-waydroid_arm64-system.zip
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-18.1-20221110-MAINLINE-waydroid_arm64-vendor.zip
+	sha256sums_aarch64 = 805b0251c32269fdf7c1a81c40661910b0df8682922361f1d26866edda4ea52f
+	sha256sums_aarch64 = 83eb0a7cd437f4de2e6b9c78f7d6a819eb28094117d092365bbf41b667950ddc
 
 pkgname = waydroid-image-gapps
diff --git a/PKGBUILD b/PKGBUILD
index a9ad58094aa7..bbfd33e126f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,18 @@
 # Contributer: Danct12 <danct12@disroot.org>
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 
-_pkgver_images_system="18.1-20221030"
-_pkgver_images_system_x86="18.1-20221030"
-_pkgver_images_system_arm="18.1-20221030"
-_pkgver_images_system_arm64="18.1-20221030"
-_pkgver_images_vendor="18.1-20221105"
-_pkgver_images_vendor_x86="18.1-20221105"
-_pkgver_images_vendor_arm="18.1-20221105"
-_pkgver_images_vendor_arm64="18.1-20221105"
+_pkgver_images_system="18.1-20221109"
+_pkgver_images_vendor="18.1-20221109"
+
+_pkgver_images_system_x86="18.1-20221109"
+_pkgver_images_vendor_x86="18.1-20221109"
+
+_pkgver_images_system_arm64="18.1-20221110"
+_pkgver_images_vendor_arm64="18.1-20221110"
+
+_pkgver_images_system_arm="18.1-20221110"
+_pkgver_images_vendor_arm="18.1-20221110"
+
 pkgname=waydroid-image-gapps
 pkgver="${_pkgver_images_system//-/_}"
 pkgrel=2
@@ -21,13 +25,13 @@ url='https://github.com/waydroid'
 depends=('waydroid')
 provides=('waydroid-image')
 source_i686=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver_images_system_x86-GAPPS-waydroid_x86-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor_x86-HALIUM_11-waydroid_x86-vendor.zip)
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor_x86-MAINLINE-waydroid_x86-vendor.zip)
 source_x86_64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver_images_system-GAPPS-waydroid_x86_64-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-HALIUM_11-waydroid_x86_64-vendor.zip)
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip)
 source_armv7h=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver_images_system_arm-GAPPS-waydroid_arm-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor_arm-HALIUM_11-waydroid_arm-vendor.zip)
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor_arm-MAINLINE-waydroid_arm-vendor.zip)
 source_aarch64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver_images_system_arm64-GAPPS-waydroid_arm64-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor_arm64-HALIUM_11-waydroid_arm64-vendor.zip)
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor_arm64-MAINLINE-waydroid_arm64-vendor.zip)
 
 case "$CARCH" in
   aarch64) _imgarch="arm64" ;;
@@ -43,11 +47,11 @@ package() {
   mv "$srcdir/vendor.img" "$pkgdir/usr/share/waydroid-extra/images"
 }
 
-sha256sums_x86_64=('2e96a24f2bb24d5b8dd6fe8bc04bdb2f4a467ed6784c912e806d30a161972264'
-                   '73aec94db726c33a32cd6b4fc3c3322c066363a8855d14f0897d66ee6540598d')
-sha256sums_i686=('99ced90314088ca535c240106d15e279be73fd77d85ce73b88a5394150e12d4f'
-                 'f8b8d7830690bca3d42fee8c8b305a68795014a9bc8286be4df90490104c3d08')
-sha256sums_armv7h=('b446705b6fce430c7ec56b00516e44ab5a6045aa6f47c3b42cdfc3c3da54d520'
-                   '9808cd679e7855aefd7e3da5e04acc6537d4640c801a8c609601a2bfaffa5942')
-sha256sums_aarch64=('be93e06b5a84e81059c2b692a80ecbf7fff4d93ff59449e7edb99d8ce53a94d5'
-                    '221c6271c2babd315a1fbae885107c3721a0d00d9ff955d6d331833e7535d48d')
+sha256sums_x86_64=('72b5b5fe3d68e5604664798044515448420ef3015e0e1ee086dbf9eb04467d95'
+                   '24374d6978cc4a03b1fbc4b2d11d4afa430ebd9d8f93b452481d77b7e8b7d3b6')
+sha256sums_i686=('82c3657d4ee058a29d64ff5561cf9613e3e3955db700815272e11917a8947efc'
+                 '37698fcce8f185baa6e4e7674a418b009d2ad6515f48e1954fa47d62a3e5dd24')
+sha256sums_armv7h=('c84602507c406958f3ac1ae8b8f84ebe23ad2162d11505363aca9763c45b8a4a'
+                   'db23686798ba272ce793e91320a4bfd77cdf9d6d6e49915d70fdedbb267c92a2')
+sha256sums_aarch64=('805b0251c32269fdf7c1a81c40661910b0df8682922361f1d26866edda4ea52f'
+                    '83eb0a7cd437f4de2e6b9c78f7d6a819eb28094117d092365bbf41b667950ddc')
diff --git a/get-latest-images-urls.sh b/get-latest-images-urls.sh
index d99235b95024..a84a22c3caed 100755
--- a/get-latest-images-urls.sh
+++ b/get-latest-images-urls.sh
@@ -1,27 +1,27 @@
 #!/bin/zsh
 curl 'https://sourceforge.net/projects/waydroid/rss?path=/images' -o file-list.rss
-echo "Latest x86_64 vendor:"
-grep link file-list.rss | grep -- '-waydroid_x86_64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo "Latest x86_64 GAPPS:"
-grep link file-list.rss | grep -- '-GAPPS-waydroid_x86_64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+grep link file-list.rss | grep -- 'GAPPS-waydroid_x86_64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest x86_64 vendor:"
+grep link file-list.rss | grep -- 'MAINLINE-waydroid_x86_64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo
 
-echo "Latest x86 vendor:"
-grep link file-list.rss | grep -- '-waydroid_x86-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo "Latest x86 GAPPS:"
-grep link file-list.rss | grep -- '-GAPPS-waydroid_x86-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+grep link file-list.rss | grep -- 'GAPPS-waydroid_x86-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest x86 vendor:"
+grep link file-list.rss | grep -- 'MAINLINE-waydroid_x86-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo
 
-echo "Latest arm64 vendor:"
-grep link file-list.rss | grep -- '-waydroid_arm64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo "Latest arm64 GAPPS:"
-grep link file-list.rss | grep -- '-GAPPS-waydroid_arm64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+grep link file-list.rss | grep -- 'GAPPS-waydroid_arm64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest arm64 vendor:"
+grep link file-list.rss | grep -- 'MAINLINE-waydroid_arm64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo
 
-echo "Latest arm vendor:"
-grep link file-list.rss | grep -- '-waydroid_arm-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 echo "Latest arm GAPPS:"
-grep link file-list.rss | grep -- '-GAPPS-waydroid_arm-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+grep link file-list.rss | grep -- 'GAPPS-waydroid_arm-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest arm vendor:"
+grep link file-list.rss | grep -- 'MAINLINE-waydroid_arm-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
 
 #cleanup
 #rm file-list.rss