Some packaging improvements

5 files changed, 41 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cfee3b6ba06..e4b5de3bfb85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pqr
-	pkgdesc = A pretty quick version of R
+	pkgdesc = A pretty quick version of R. Can be installed side-by-side with vanilla R.
 	pkgver = 20161024
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.pqr-project.org/
 	install = pqr.install
 	arch = i686
@@ -18,12 +18,10 @@ pkgbase = pqr
 	optdepends = texlive-bin: latex sty files
 	options = !makeflags
 	options = !emptydirs
-	source = http://www.pqr-project.org/pqR-2016-10-24.tar.gz
+	source = pqR-2016-10-24.tar.gz::http://www.pqr-project.org/pqR-2016-10-24.tar.gz
 	source = pqr.desktop
-	source = pqr.png
 	sha256sums = de6ebb98ffde2dae669fc4db25d3d9f65af8a5c523dd305e82b24cb17de3ada7
 	sha256sums = c22cb2c5c98e8cd9cece75160ceb6edf6850fd84cd1c34f7d1325ac83874211a
-	sha256sums = 281e4b365b164930af35046178e7012d29f1b7aece17a95658ac049d77a05df6
 
 pkgname = pqr
 
diff --git a/PKGBUILD b/PKGBUILD
index 9507f99af11f..c822900ec3ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Conor Anderson <conor[dot]anderson[at]utoronto.ca>
+# Maintainer: Conor Anderson <conor@conr.ca>
 pkgname=pqr
+_pkgname=pqR
 _pkgver="2016-10-24"
 pkgver=${_pkgver//-/}
-pkgrel=1
-pkgdesc="A pretty quick version of R"
+pkgrel=2
+pkgdesc="A pretty quick version of R. Can be installed side-by-side with vanilla R."
 arch=('i686' 'x86_64')
 url="http://www.pqr-project.org/"
 license=('GPL')
@@ -12,27 +13,44 @@ makedepends=('gcc-fortran')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 options=('!makeflags' '!emptydirs')
 install=$pkgname.install
-source=("http://www.pqr-project.org/pqR-${_pkgver}.tar.gz"
-	'pqr.desktop'
-	'pqr.png')
+source=("${_pkgname}-${_pkgver}.tar.gz::http://www.pqr-project.org/${_pkgname}-${_pkgver}.tar.gz"
+	'pqr.desktop')
 sha256sums=('de6ebb98ffde2dae669fc4db25d3d9f65af8a5c523dd305e82b24cb17de3ada7'
-            'c22cb2c5c98e8cd9cece75160ceb6edf6850fd84cd1c34f7d1325ac83874211a'
-            '281e4b365b164930af35046178e7012d29f1b7aece17a95658ac049d77a05df6')
+            'c22cb2c5c98e8cd9cece75160ceb6edf6850fd84cd1c34f7d1325ac83874211a')
 
 build() {
-  cd "pqR-${_pkgver}"
+  cd "${_pkgname}-${_pkgver}"
   ./configure --prefix=/opt/pqr --enable-R-shlib
   make
 }
 
 package() {
-  cd "pqR-${_pkgver}"
+  cd "${_pkgname}-${_pkgver}"
 
   make DESTDIR="${pkgdir}/" install
 
-  # install some freedesktop.org compatibility (borrowed form r-devel)
-  install -Dm644 "${srcdir}/pqr.desktop" \
-	"${pkgdir}/usr/share/applications/pqr.desktop"
-  install -Dm644 "${srcdir}/pqr.png" \
-	"${pkgdir}/opt/pqr/pqr.png"
+  # Symlink binaries
+  install -d "${pkgdir}/usr/bin"
+  ln -s "/opt/${pkgname}/bin/R" "${pkgdir}/usr/bin/${_pkgname}"
+  ln -s "/opt/${pkgname}/bin/R" "${pkgdir}/usr/bin/${_pkgname}script"
+
+  # Place desktop entry and icons
+  desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${srcdir}/${pkgname}.desktop"
+  for res in "16x16" "32x32" "48x48" "256x256"
+  do
+    install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
+    if [ "$res" == "16x16" ] | [ "$res" == "32x32" ]
+    then
+      install -Dm644 "${srcdir}/${_pkgname}-${_pkgver}/doc/html/logo-${res}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${pkgname}.png"
+    elif [ "$res" == "48x48" ]
+    then
+      install -Dm644 "${srcdir}/${_pkgname}-${_pkgver}/doc/html/logosmsq.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${pkgname}.png"
+    else
+      install -Dm644 "${srcdir}/${_pkgname}-${_pkgver}/doc/html/logolgsq.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${pkgname}.png"
+    fi
+  done
 }
+
diff --git a/pqr.desktop b/pqr.desktop
index f0a5d1a67fab..f067169ffd1e 100644
--- a/pqr.desktop
+++ b/pqr.desktop
@@ -2,8 +2,8 @@
 Name=pqR
 GenericName=environment for statistical computing
 Comment=a pretty quick version of R
-Exec=/opt/pqr/bin/R
-Icon=/opt/pqr/pqr.png
+Exec=pqR
+Icon=pqr
 StartupNotify=true
 Terminal=true
 Type=Application
diff --git a/pqr.install b/pqr.install
index 2422428fd99a..838cb07cecea 100644
--- a/pqr.install
+++ b/pqr.install
@@ -1,9 +1,9 @@
 post_install() {
-    echo "pqR has been installed to /opt/pqr"
-    echo "to use with RStudio set your environment variables like: export RSTUDIO_WHICH_R='/opt/pqr/bin/R'"
+  echo "pqR has been installed to /opt/pqr"
+  echo "To use with RStudio, set your environment variables like: export RSTUDIO_WHICH_R='/opt/pqr/bin/R'"
 }
 
 post_upgrade() {
-    post_install()
+  post_install()
 }
 
diff --git a/pqr.png b/pqr.png
deleted file mode 100644
index 27d45ab25ec1..000000000000
--- a/pqr.png
+++ /dev/null