Fix server not downloading when updating

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11a60ef8ea33..0864ce6bf62c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scrcpy
 	pkgdesc = Display and control your Android device
 	pkgver = 1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Genymobile/scrcpy
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = scrcpy
 	depends = sdl2
 	optdepends = android-sdk-platform-tools: required if adb is not already installed
 	source = https://github.com/Genymobile/scrcpy/archive/v1.1.tar.gz
-	source = scrcpy-server.jar::https://github.com/Genymobile/scrcpy/releases/download/v1.1/scrcpy-server-v1.1.jar
+	source = https://github.com/Genymobile/scrcpy/releases/download/v1.1/scrcpy-server-v1.1.jar
 	sha256sums = 1b56caa4aad5add2c49ea436e9f26282b55a413003d0d73b029a1fbf48da0a1c
 	sha256sums = 14826512bf38447ec94adf3b531676ce038d19e7e06757fb4e537882b17e77b3
 
diff --git a/PKGBUILD b/PKGBUILD
index 10b0ff87e448..035c5d5045e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=scrcpy
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Display and control your Android device'
 arch=('i686' 'x86_64')
 url='https://github.com/Genymobile/scrcpy'
@@ -11,26 +11,31 @@ depends=('ffmpeg' 'sdl2')
 makedepends=('gcc' 'meson')
 optdepends=('android-sdk-platform-tools: required if adb is not already installed')
 source=("https://github.com/Genymobile/scrcpy/archive/v${pkgver}.tar.gz"
-        "scrcpy-server.jar::https://github.com/Genymobile/scrcpy/releases/download/v${pkgver}/scrcpy-server-v${pkgver}.jar")
+        "https://github.com/Genymobile/scrcpy/releases/download/v${pkgver}/scrcpy-server-v${pkgver}.jar")
 sha256sums=('1b56caa4aad5add2c49ea436e9f26282b55a413003d0d73b029a1fbf48da0a1c'
             '14826512bf38447ec94adf3b531676ce038d19e7e06757fb4e537882b17e77b3')
 
-_srcname="scrcpy-${pkgver}"
+src_name="scrcpy-${pkgver}"
+src_server="scrcpy-server-v${pkgver}.jar"
 
+server_path='/usr/share/scrcpy/scrcpy-server.jar'
 
 build() {
-    cd ${_srcname}
+    cd "${src_name}"
 
     rm -rf build
     meson build --buildtype release --strip -Db_lto=true \
         -Dbuild_server=false \
-        -Doverride_server_path=/usr/share/scrcpy/scrcpy-server.jar
+        -Doverride_server_path="${server_path}"
     cd build
     ninja
 }
 
 package() {
-    mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/share/scrcpy
-    install -m 755 ${_srcname}/build/app/scrcpy "${pkgdir}"/usr/bin/
-    install -m 755 scrcpy-server.jar "${pkgdir}"/usr/share/scrcpy/
+    mkdir -p \
+        "${pkgdir}"/usr/bin \
+        "${pkgdir}"/"$(dirname "${server_path}")"
+
+    install -m 755 "${src_name}"/build/app/scrcpy "${pkgdir}"/usr/bin/
+    install -m 755 "${src_server}"                "${pkgdir}"/"${server_path}"
 }