Fix wrong 33.0.1.0.0 subdirectory

2 files changed, 11 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 629e1c2c8c15..97a33e2ba797 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-sdk-build-tools
 	pkgdesc = Build-Tools for Google Android SDK (aapt, aidl, dexdump, dx, llvm-rs-cc)
 	pkgver = r33.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.android.com/studio/releases/build-tools
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index 5a32ddab90fd..b9c56d08dae5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,12 @@
 
 pkgname=android-sdk-build-tools
 #_ver=$(cat "${srcdir}/$_android/source.properties" |grep ^Pkg.Revision=|sed 's/Pkg.Revision=\([0-9.]*\).*/\1/')
-_ver=33.0.1
+_major=33
+_minor=0
+_micro=1
+_ver=$_major.$_minor.$_micro
 pkgver=r$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='Build-Tools for Google Android SDK (aapt, aidl, dexdump, dx, llvm-rs-cc)'
 arch=('x86_64')
 url="https://developer.android.com/studio/releases/build-tools"
@@ -26,12 +29,12 @@ package() {
   cd "$pkgdir"
 
   install -d usr/share/licenses/$pkgname/
-  ln -s /opt/$_sdk/build-tools/$_ver.0.0/NOTICE.txt usr/share/licenses/$pkgname/NOTICE.txt
-  sed -i "s/@major@/$_ver/g;s/@minor@/0/g;s/@micro@/0/g" "$srcdir/package.xml"
-  install -Dm644 "${srcdir}/package.xml" opt/$_sdk/build-tools/$_ver.0.0/package.xml
-  ln -s /opt/$_sdk/build-tools/$_ver.0.0/package.xml usr/share/licenses/$pkgname/package.xml
+  ln -s /opt/$_sdk/build-tools/$_ver/NOTICE.txt usr/share/licenses/$pkgname/NOTICE.txt
+  sed -i "s/@major@/$_major/g;s/@minor@/$_minor/g;s/@micro@/$_micro/g" "$srcdir/package.xml"
+  install -Dm644 "${srcdir}/package.xml" opt/$_sdk/build-tools/$_ver/package.xml
+  ln -s /opt/$_sdk/build-tools/$_ver/package.xml usr/share/licenses/$pkgname/package.xml
 
-  target="opt/$_sdk/build-tools/$_ver.0.0"
+  target="opt/$_sdk/build-tools/$_ver"
   mkdir -p "$target"
   cp -r "$srcdir/$_android/"* "$target"
   chmod +Xr -R "$target"