[arch-commits] Commit in paraview/trunk (5 files)

[Bruno Pagani]

    Date: Sunday, March 27, 2022 @ 09:14:40
  Author: archange
Revision: 1177170

Install more binaries and forward args

Added:
  paraview/trunk/template.sh
    (from rev 1177169, paraview/trunk/paraview.sh)
Modified:
  paraview/trunk/PKGBUILD
  paraview/trunk/paraview-wrapper.sh
Deleted:
  paraview/trunk/paraview.sh
  paraview/trunk/pvpython.sh

---------------------+
 PKGBUILD            |   16 ++++++++--------
 paraview-wrapper.sh |    2 +-
 paraview.sh         |    3 ---
 pvpython.sh         |    3 ---
 template.sh         |    3 +++
 5 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-27 08:40:36 UTC (rev 1177169)
+++ PKGBUILD	2022-03-27 09:14:40 UTC (rev 1177170)
@@ -8,7 +8,7 @@
 pkgname=${_pkg}
 #-${_mpi}
 pkgver=5.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
@@ -26,15 +26,13 @@
 # catalyst, exprtk, ioss: not packaged
 source=(${url}/files/v${pkgver%.*}/ParaView-v${pkgver/R/-R}.tar.xz
         paraview-wrapper.sh
-        paraview.sh
-        pvpython.sh
+        template.sh
         vtkm-tbb-2021.patch::https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2509.patch
         vtk-ffmpeg5.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8863.patch
         revert-smp-info.patch) # Derived from https://gitlab.kitware.com/paraview/paraview/-/merge_requests/5131
 sha256sums=('520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2'
-            '05bd6268b3a6dddfcdbc106a3414d0aa9663ae48ce4775fdd9f5ed02c1bbae02'
-            'e81fa887b484d98fd0df3b13e9ba19f57e50131c173ea126265cec0b529dd3f5'
-            '0f3557fd21de013628826c2c971a48564dca63cbf943c76a6f7021a9a84e6223'
+            'd1cdb4a81db280d6b21bee3d9e5f8fc3a87f00a909d33850a1964c72091ec138'
+            '844d44a14817c656ba8d6998298785125a98f03f7b5ece58d966c226db1e0d83'
             '37cff664c4eaacf44ecb995e62e9e54e54880bae0857d598c74660a2159ccb2e'
             '066ad5eb3f7cd101c4bbbe4d91ba97419f18537f9dadf6654776b7151c7c6a8d'
             'fb7496032d3e9fc8575b533127b5d93c7a2d0a1a2c2abad859f4f40ea06e55c7')
@@ -96,9 +94,11 @@
   DESTDIR="${pkgdir}" ninja -C build install
 
   # Install wrappers
-  for file in paraview-wrapper.sh paraview.sh pvpython.sh
+  install -Dm755 paraview-wrapper.sh "${pkgdir}"/usr/bin/paraview-wrapper
+  for binary in paraview "${pkgdir}"/opt/paraview/bin/pv*
   do
-      install -Dm755 ${file} "${pkgdir}"/usr/bin/${file%.sh}
+      install -Dm755 template.sh "${pkgdir}"/usr/bin/${binary##*/}
+      sed -i "s|@BINARY@|${binary##*/}|" "${pkgdir}"/usr/bin/${binary##*/}
   done
 
   # Install licenses, shortcuts, icons

Modified: paraview-wrapper.sh
===================================================================
--- paraview-wrapper.sh	2022-03-27 08:40:36 UTC (rev 1177169)
+++ paraview-wrapper.sh	2022-03-27 09:14:40 UTC (rev 1177170)
@@ -4,4 +4,4 @@
 export PYTHONPATH=/opt/paraview/lib/python at PYTHON@/site-packages/:"${PYTHONPATH}"
 export LD_LIBRARY_PATH=/opt/paraview/lib/:"${LD_LIBRARY_PATH}"
 
-exec /opt/paraview/bin/$1
+exec /opt/paraview/bin/"$@"

Deleted: paraview.sh
===================================================================
--- paraview.sh	2022-03-27 08:40:36 UTC (rev 1177169)
+++ paraview.sh	2022-03-27 09:14:40 UTC (rev 1177170)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec paraview-wrapper paraview

Deleted: pvpython.sh
===================================================================
--- pvpython.sh	2022-03-27 08:40:36 UTC (rev 1177169)
+++ pvpython.sh	2022-03-27 09:14:40 UTC (rev 1177170)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec paraview-wrapper pvpython

Copied: paraview/trunk/template.sh (from rev 1177169, paraview/trunk/paraview.sh)
===================================================================
--- template.sh	                        (rev 0)
+++ template.sh	2022-03-27 09:14:40 UTC (rev 1177170)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec paraview-wrapper @BINARY@ "$@"