Cosmetics

2 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c8b6882b4a8..c14f421fa7da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 1.2.5033.r3971
+	pkgver = 1.2.5033.r5032
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	arch = i686
@@ -19,12 +19,8 @@ pkgbase = rstudio-desktop-git
 	makedepends = patchelf
 	makedepends = wget
 	makedepends = yarn
-	depends = boost-libs
 	depends = r>=3.0.1
-	depends = hunspell-en_US
-	depends = mathjax2
-	depends = pandoc
-	depends = clang
+	depends = boost-libs
 	depends = qt5-sensors
 	depends = qt5-svg
 	depends = qt5-webengine
@@ -32,12 +28,14 @@ pkgbase = rstudio-desktop-git
 	depends = postgresql-libs
 	depends = sqlite3
 	depends = soci
+	depends = clang
+	depends = hunspell-en_US
+	depends = mathjax2
+	depends = pandoc
 	optdepends = git: for git support
 	optdepends = subversion: for subversion support
 	optdepends = openssh-askpass: for a git ssh access
 	provides = rstudio-desktop
-	provides = rstudio-desktop-bin
-	provides = rstudio-desktop-preview
 	conflicts = rstudio-desktop
 	conflicts = rstudio-desktop-bin
 	conflicts = rstudio-desktop-preview
diff --git a/PKGBUILD b/PKGBUILD
index 01dbfa61efea..937cca52074b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Artem Klevtsov <a.a.klevtso@gmail.com>
+# Maintainer: Stephen Martin <hwkiller@gmail.com>
 # Contributor: Conor Anderson <conor@conr.ca>
 
 pkgname=rstudio-desktop-git
 _gitname=rstudio
-pkgver=1.2.5033.r3971
+pkgver=1.2.5033.r5032
 _gwtver=2.8.2
 _ginver=2.1.2
 _nodever=10.19.0
@@ -12,12 +13,12 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
-depends=('boost-libs' 'r>=3.0.1' hunspell-en_US mathjax2 pandoc clang qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci)
-makedepends=(git 'cmake>=3.1.0' 'boost' desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn)
+depends=('r>=3.0.1' boost-libs qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci clang hunspell-en_US mathjax2 pandoc)
+makedepends=(git 'cmake>=3.1.0' boost desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn)
 optdepends=('git: for git support'
             'subversion: for subversion support'
             'openssh-askpass: for a git ssh access')
-provides=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
+provides=('rstudio-desktop')
 conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
 source=("git+https://github.com/rstudio/rstudio.git"
         "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
@@ -25,8 +26,7 @@ source=("git+https://github.com/rstudio/rstudio.git"
 	"https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
 	"soci.patch"
 	"rstudio_boost.patch"
-	"qt.conf"
-       )
+	"qt.conf")
 sha256sums=('SKIP'
             'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
             '970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
@@ -65,12 +65,12 @@ prepare() {
 
     # Nodejs
     install -d node/${_nodever}
-    cp -r ${srcdir}/node-v${_nodever}-linux-x64/* node/${_nodever}
-    cd ${srcdir}/${_gitname}/src/gwt/panmirror/src/editor
+    cp -r "${srcdir}/node-v${_nodever}-linux-x64/"* node/${_nodever}
+    cd "${srcdir}/${_gitname}/src/gwt/panmirror/src/editor"
     yarn config set ignore-engines true
     yarn install
- 
-    cd ${srcdir}/${_gitname}/dependencies/common
+
+    cd "${srcdir}/${_gitname}/dependencies/common"
     msg "Downloading and installing R packages..."
     bash install-packages
 }
@@ -78,28 +78,33 @@ prepare() {
 build() {
     rm -rf "${srcdir}/${_gitname}/build"
     mkdir "${srcdir}/${_gitname}/build"
+
     cd "${srcdir}/${_gitname}/build"
+
     export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:${PATH}
+
     cmake -DRSTUDIO_TARGET=Desktop \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \
           -DRSTUDIO_USE_SYSTEM_BOOST=yes \
           -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
           -DBoost_NO_BOOST_CMAKE=ON \
-	  -DRSTUDIO_USE_SYSTEM_SOCI=yes \
+          -DRSTUDIO_USE_SYSTEM_SOCI=yes \
           -DRSTUDIO_BUNDLE_QT=FALSE ..
 }
 
 package() {
-    cd "${srcdir}/${_gitname}/build"
     # Install the program
+    cd "${srcdir}/${_gitname}/build"
     make DESTDIR="${pkgdir}" install
+
     # Install the license
     install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
     # Symlink main binary
     install -d "${pkgdir}/usr/bin"
-    ln -s "/usr/lib/${_gitname}/bin/${_gitname}" "${pkgdir}/usr/bin/${_gitname}"
+    ln -s "/usr/lib/rstudio/bin/rstudio" "${pkgdir}/usr/bin/rstudio"
 
     # BUGFIX: qt5-webengine isn't init'ing properly. Likely an Rstudio bug.
-    install -D "${srcdir}/qt.conf" "${pkgdir}/usr/lib/qt/libexec/qt.conf"
+    install -Dm 644 "${srcdir}/qt.conf" "${pkgdir}/usr/lib/qt/libexec/qt.conf"
 }