optdepents format updated

3 files changed, 16 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebd96967ecd0..be6fc9017713 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Aug 24 08:13:28 UTC 2020
+# Thu Nov 26 11:19:10 UTC 2020
 pkgbase = geant4-abladata
 	pkgdesc = Data files for nuclear shell effects in INCL/ABLA hadronic mode
 	pkgver = 3.1
@@ -8,11 +8,11 @@ pkgbase = geant4-abladata
 	install = geant4-abladata.install
 	arch = any
 	license = GPL
-	depends = geant4>=10.4.0
+	optdepends = geant4>=10.4
 	source = https://cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz
 	source = geant4-abladata.install
 	sha256sums = 7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed
-	sha256sums = 89ddd9fb1b7d855cd1bbe75c7c7e3843b48adc4afeaaaf846d6355cd3e86f9b8
+	sha256sums = d4fbb80f577e0d5c8b2e0b71b9be0089a78a43852b93284694f99ec58e003512
 
 pkgname = geant4-abladata
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c8a5abce633..d84092cca994 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: L.G. Sarmiento (Pico) <Luis.Sarmientop-ala-nuclear.lu.se>
 pkgname=geant4-abladata
+_varname='G4ABLADATA'
 _dataname="G4ABLA"
 _foldername="G4ABLA"
 pkgver=3.1
@@ -8,14 +9,12 @@ pkgdesc="Data files for nuclear shell effects in INCL/ABLA hadronic mode"
 url="http://geant4.cern.ch/"
 arch=('any')
 license=('GPL')
-depends=('geant4>=10.4.0')
-#it cannot be optdepend since we require the geant4.sh file to exist
-#to setup the environment variable
+optdepends=('geant4>=10.4')
 install="${pkgname}.install"
 source=("https://cern.ch/geant4-data/datasets/${_dataname}.${pkgver}.tar.gz"
   "${pkgname}.install")
 sha256sums=('7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed'
-            '89ddd9fb1b7d855cd1bbe75c7c7e3843b48adc4afeaaaf846d6355cd3e86f9b8')
+            'd4fbb80f577e0d5c8b2e0b71b9be0089a78a43852b93284694f99ec58e003512')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -24,4 +23,11 @@ PKGEXT='.pkg.tar'
 package() {
   install -d ${pkgdir}/usr/share/${pkgname}
   mv ${srcdir}/${_foldername}${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-abladata.install b/geant4-abladata.install
index 31bf6a4f8b97..b9c06c6ad097 100644
--- a/geant4-abladata.install
+++ b/geant4-abladata.install
@@ -1,34 +1,19 @@
 #!/bin/sh
 
 _varname='G4ABLADATA'
-_packagename='geant4-abladata'
-_foldername='G4ABLA'
-
-_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
 }