summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD13
-rw-r--r--rstudio.sh3
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a589ea529641..191107660700 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -47,11 +47,13 @@ pkgbase = rstudio-desktop-git
source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip
source = https://s3.amazonaws.com/rstudio-buildtools/QtSDK-5.10.0-x86_64.tar.gz
source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+ source = rstudio.sh
md5sums = SKIP
md5sums = e2617189fe5c138945b8cc95f26bd476
md5sums = ddd572887957fd5cdfde3469bd8c1102
md5sums = bb822961716efd40d570a07a34c9c373
md5sums = 0e03798b8e53096c4a906bde05e32378
+ md5sums = 625896d99d6f3367304e728da34d33eb
pkgname = rstudio-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 87950e6da6a9..193a3175799c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,12 +26,14 @@ source=("git+https://github.com/rstudio/rstudio.git"
"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
"https://s3.amazonaws.com/rstudio-buildtools/QtSDK-${_qtver}-x86_64.tar.gz"
- "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip")
+ "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip"
+ "rstudio.sh")
md5sums=('SKIP'
'e2617189fe5c138945b8cc95f26bd476'
'ddd572887957fd5cdfde3469bd8c1102'
'bb822961716efd40d570a07a34c9c373'
- '0e03798b8e53096c4a906bde05e32378')
+ '0e03798b8e53096c4a906bde05e32378'
+ '625896d99d6f3367304e728da34d33eb')
pkgver() {
cd "${srcdir}/${_gitname}"
@@ -81,7 +83,8 @@ package() {
make DESTDIR="${pkgdir}" install
# Install the license
install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
- # Create symlinks
- install -d "${pkgdir}/usr/bin"
- ln -sf /usr/lib/rstudio/bin/rstudio "${pkgdir}/usr/bin/rstudio"
+ # Install launch script
+ install -Dm 755 "${srcdir}/rstudio.sh" "${pkgdir}/usr/bin/rstudio"
+ # Fix LD_LIBRARY_PATH in .desktop file
+ sed -i 's|/usr/lib/rstudio/bin/rstudio|/usr/bin/rstudio|g' "${pkgdir}/usr/share/applications/rstudio.desktop"
}
diff --git a/rstudio.sh b/rstudio.sh
new file mode 100644
index 000000000000..f6681e9645f9
--- /dev/null
+++ b/rstudio.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export LD_LIBRARY_PATH=/usr/lib/rstudio/lib
+exec /usr/lib/rstudio/bin/rstudio "$@"