[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

[Evgeniy Alekseev]

    Date: Tuesday, December 24, 2013 @ 16:19:06
  Author: arcanis
Revision: 102935

upgpkg: sage-mathematics 6.0-2
/usr/bin/sage-sage moved to /usr/bin/sage

Modified:
  sage-mathematics/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-24 12:57:11 UTC (rev 102934)
+++ PKGBUILD	2013-12-24 15:19:06 UTC (rev 102935)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
@@ -125,10 +125,6 @@
   install -d "${pkgdir}/usr/share"
   mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
   
-  # create link to main binary
-  install -d "${pkgdir}/usr/bin"
-  ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage"
-  
   # remove build logs
   rm -f "${pkgdir}/opt/sage/*.log"
   rm -rf "${pkgdir}/opt/sage/spkg/logs"
@@ -139,11 +135,13 @@
   
   # according to FS#37090
   # install scripts
+  install -d "${pkgdir}/usr/bin"
   ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)"
   # rename scripts to avoid conflicts
   for ITEM in $(ls "${pkgdir}/usr/bin"); do
     mv "${pkgdir}/usr/bin/${ITEM}" "${pkgdir}/usr/bin/sage-${ITEM}"
   done
+  ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage"
   
   # install a systemd user unit
   install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service"