geant4make scripts also get envir variables removed

3 files changed, 29 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1f7c857a15d..0a20c11901a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Jan 31 17:43:23 UTC 2021
+# Sun Jan 31 21:04:18 UTC 2021
 
 
 pkgbase = geant4
@@ -36,7 +36,7 @@ pkgbase = geant4
 	source = http://cern.ch/geant4-data/releases/geant4.10.07.tar.gz
 	source = geant4.install
 	sha256sums = 776ea45230d26fffebf0cf7a342af5131135759a0f70e1b4a1a401f1d1eaad4a
-	sha256sums = 3ee29b5a0644050c7272cedb5e3db6f3b5acf6f6897b74ff03a9596a271506e4
+	sha256sums = 0eae153900d995603b0b465c9f17225ba76dd8118377507916fc709360482058
 
 pkgname = geant4
 
diff --git a/PKGBUILD b/PKGBUILD
index 7bc75dbd0e42..9c77d4e25ffa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,7 +37,7 @@ install="${pkgname}.install"
 source=("http://cern.ch/geant4-data/releases/${pkgname}.${_pkgver}.tar.gz"
         "${pkgname}.install")
 sha256sums=('776ea45230d26fffebf0cf7a342af5131135759a0f70e1b4a1a401f1d1eaad4a'
-            '3ee29b5a0644050c7272cedb5e3db6f3b5acf6f6897b74ff03a9596a271506e4')
+            '0eae153900d995603b0b465c9f17225ba76dd8118377507916fc709360482058')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -100,16 +100,25 @@ package() {
   do
     sed -i "/${_varname}/d" ${srcdir}/build/InstallTreeFiles/geant4.sh
     sed -i "/${_varname}/d" ${srcdir}/build/InstallTreeFiles/geant4.csh
+
+    # disencouraged in-source compilation option
+    sed -i "/${_varname}/d" ${srcdir}/build/InstallTreeFiles/geant4make.sh
+    sed -i "/${_varname}/d" ${srcdir}/build/InstallTreeFiles/geant4make.csh
   done
 
   cd ${srcdir}/build
   make DESTDIR="${pkgdir}" install
 
-  echo 'pushd /usr/bin &> /dev/null && source geant4.sh  && popd &> /dev/null' > ${srcdir}/geant4.profile.sh
-  echo 'pushd /usr/bin >& /dev/null && source geant4.csh && popd >& /dev/null' > ${srcdir}/geant4.profile.csh
+  # create a shell script to be initialized along with the terminals for out-of-source compilation
+  echo 'pushd /usr/bin &> /dev/null && source geant4.sh  && popd &> /dev/null' > ${srcdir}/geant4_profile.sh
+  echo 'pushd /usr/bin >& /dev/null && source geant4.csh && popd >& /dev/null' > ${srcdir}/geant4_profile.csh
   install -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/geant4.profile.sh  ${pkgdir}/etc/profile.d/geant4.sh
-  install -m755 ${srcdir}/geant4.profile.csh ${pkgdir}/etc/profile.d/geant4.csh
+  install -m755 ${srcdir}/geant4_profile.sh  ${pkgdir}/etc/profile.d/geant4_profile.sh
+  install -m755 ${srcdir}/geant4_profile.csh ${pkgdir}/etc/profile.d/geant4_profile.csh
+
+  # install explicitly disencouraged in-source compilation option
+  install -m755 ${srcdir}/build/InstallTreeFiles/geant4make.sh  ${pkgdir}/usr/bin/geant4make.sh
+  install -m755 ${srcdir}/build/InstallTreeFiles/geant4make.csh ${pkgdir}/usr/bin/geant4cmake.sh
 }
 
 # All this is just a comment
diff --git a/geant4.install b/geant4.install
index 4c5d318154c8..2fcad7eb664a 100644
--- a/geant4.install
+++ b/geant4.install
@@ -17,26 +17,29 @@ _init() {
 
 shell=("sh" "csh")
 
-existing="existing"
-path="/etc/profile.d"
+existing_out="existing_out" # out-of-source compilation
+existing_in="existing_in"   # in-source compilation
+path="/usr/bin"
 }
 _clean(){
     for _ext in ${shell[*]}
     do
-        rm -f $existing.${_ext}
+        rm -f $existing_out.${_ext}
+        rm -f $existing_in.${_ext}
     done
 }
 _read() {
     _init
     for _varname in ${variables[*]}
     do
-	if [ "$_varname" == "G4NEUTRONXS" ]   # to be removed
-	then
-	    continue
-	fi
         for _ext in ${shell[*]}
         do
-            sed -n /${_varname}/p ${path}/geant4.${_ext} >> $existing.${_ext}
+            if [ -f ${path}/geant4.${_ext} ]; then
+                sed -n /${_varname}/p ${path}/geant4.${_ext}     >> $existing_out.${_ext}
+            fi
+            if [ -f ${path}/geant4make.${_ext} ]; then
+                sed -n /${_varname}/p ${path}/geant4make.${_ext} >> $existing_in.${_ext}
+            fi
 	done
     done
 }
@@ -44,7 +47,8 @@ _keep() {
     _init
     for _ext in ${shell[*]}
     do
-        cat $existing.${_ext} >> ${path}/geant4.${_ext}
+        cat $existing_out.${_ext} >> ${path}/geant4.${_ext}
+        cat $existing_in.${_ext}  >> ${path}/geant4make.${_ext}
     done
     _clean
 }