geant4 is now optdepends

2 files changed, 14 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c0594ec96dd4..878dc477f5d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: L.G. Sarmiento (Pico) <Luis.Sarmientop-ala-nuclear.lu.se>
 pkgname=geant4-piidata
+_varname='G4PIIDATA'
 _dataname="G4PII"
+_foldername='G4PII'
 pkgver=1.3
 pkgrel=4
 pkgdesc="Data files for shell ionisation cross-sections"
 url="http://geant4.cern.ch/"
 arch=('any')
 license=('GPL')
-depends=('geant4>=9.6.2')
-#it cannot be optdepend since we require the geant4.sh file to exist
-#to setup the environment variable
+optdepends=('geant4>=9.6.2')
 install="${pkgname}.install"
 source=("https://cern.ch/geant4-data/datasets/${_dataname}.${pkgver}.tar.gz"
   "${pkgname}.install")
 sha256sums=('6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926'
-            'a414b370d8b3dffb488b242a9892cd72c875772cfc99e16b1a0dce543b2cb25b')
+            'ac82fef9697cff1c0165735e3dff34506200e31ea78226f58766036bb309fae6')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -23,4 +23,11 @@ PKGEXT='.pkg.tar'
 package() {
   install -d ${pkgdir}/usr/share/${pkgname}
   mv ${srcdir}/${_dataname}${pkgver} ${pkgdir}/usr/share/${pkgname}
+
+  echo "export ${_varname}=/usr/share/${pkgname}/${_foldername}${pkgver}" > ${srcdir}/${pkgname}.sh
+  echo "setenv ${_varname} /usr/share/${pkgname}/${_foldername}${pkgver}" > ${srcdir}/${pkgname}.csh
+
+  install -d ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/${pkgname}.sh  ${pkgdir}/etc/profile.d/${pkgname}.sh
+  install -m755 ${srcdir}/${pkgname}.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
 }
diff --git a/geant4-piidata.install b/geant4-piidata.install
index 01ad937a8261..71396c3c5f12 100644
--- a/geant4-piidata.install
+++ b/geant4-piidata.install
@@ -1,34 +1,19 @@
 #!/bin/sh
 
 _varname='G4PIIDATA'
-_packagename='geant4-piidata'
-_foldername='G4PII'
-
-_add() {
-    _dataversion=${1}
-    echo "export ${_varname}=/usr/share/${_packagename}/${_foldername}${_dataversion}" >> /etc/profile.d/geant4.sh
-    echo "setenv ${_varname} /usr/share/${_packagename}/${_foldername}${_dataversion}" >> /etc/profile.d/geant4.csh
-}
 
 _remove() {
-    sed -i "/${_varname}/d" /etc/profile.d/geant4.sh
-    sed -i "/${_varname}/d" /etc/profile.d/geant4.csh
+    ## from the time where this variables where stored in this one script
+    sed -n -i "/${_varname}/d" /etc/profile.d/geant4.sh  2>/dev/null
+    sed -n -i "/${_varname}/d" /etc/profile.d/geant4.csh 2>/dev/null
 }
 
 pre_install() {
     _remove
 }
-post_install() {
-    _version=${1::-2}
-    _add ${_version}
-}
 pre_upgrade() {
     _remove
 }
-post_upgrade() {
-    _version=${1::-2}
-    _add ${_version}
-}
 pre_remove() {
     _remove
 }