From 42f94e16b2d14dd74b729c95262bec1fb9dedfb8 Mon Sep 17 00:00:00 2001
From: "Bernhard F.W. Gschaider" <bgschaid@ice-sf.at>
Date: Wed, 15 Oct 2014 00:27:16 +0200
Subject: [PATCH] Make sure that all bazaar-installations go either to USER or
 to SITE

---
 extend-bazaar/Allwmake | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/extend-bazaar/Allwmake b/extend-bazaar/Allwmake
index aeff431e3..c10a2bb74 100755
--- a/extend-bazaar/Allwmake
+++ b/extend-bazaar/Allwmake
@@ -1,6 +1,34 @@
 #!/bin/bash
 cd ${0%/*} || exit 1    # run from this directory
 
+echo
+if [ ! -z "$EXTEND_BAZAAR_TO_SITE" ]; then
+    echo "Bazaar stuff installed to $FOAM_SITE_APPBIN and $FOAM_SITE_LIBBIN and will be accessible to everyone. To change this unset variable EXTEND_BAZAAR_TO_SITE"
+else
+    echo "Bazaar stuff installed to $FOAM_USER_APPBIN and $FOAM_USER_LIBBIN and will be accessible only for the current user. To change this set variable EXTEND_BAZAAR_TO_SITE"
+fi
+    echo
+
+setDestination()
+{
+    pkg=$1
+    if [ ! -z "$EXTEND_BAZAAR_TO_SITE" ]; then
+	dst="SITE"
+	wrong="USER"
+    else
+	dst="USER"
+	wrong="SITE"
+    fi
+
+    # remove installation to general binaries
+    find $pkg -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_LIBBIN/FOAM_${dst}_LIBBIN/g
+    find $pkg -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_APPBIN/FOAM_${dst}_APPBIN/g
+
+    # revert installation to the "other" destination
+    find $pkg -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_${wrong}_LIBBIN/FOAM_${dst}_LIBBIN/g
+    find $pkg -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_${wrong}_APPBIN/FOAM_${dst}_APPBIN/g
+
+}
 
 # Install Fluid-Structure Interaction package
 if [ ! -d "FluidStructureInteraction" ]; then
@@ -9,6 +37,8 @@ if [ ! -d "FluidStructureInteraction" ]; then
     rm Fsi_31.tar.gz
 fi
 
+setDestination FluidStructureInteraction
+
 (
     cd FluidStructureInteraction/src
     ./Allwmake
@@ -20,9 +50,8 @@ if [ ! -d "cfMesh-v1.0" ]; then
     tar zxvf cfMesh-v1.0.tgz
     rm cfMesh-v1.0.tgz
 fi
-# Change FOAM_LIBBIN to FOAM_USER_LIBBIN
-find cfMesh-v1.0/ -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_LIBBIN/FOAM_USER_LIBBIN/g
-find cfMesh-v1.0/ -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_APPBIN/FOAM_USER_APPBIN/g
+
+setDestination cfMesh-v1.0
 
 (
     cd cfMesh-v1.0
@@ -34,6 +63,8 @@ if [ ! -d "MakeAxialMesh" ]; then
     svn export svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.6/utilities/mesh/manipulation/MakeAxialMesh MakeAxialMesh
 fi
 
+setDestination MakeAxialMesh
+
 wmake MakeAxialMesh/makeAxialMesh
 
 # ----------------------------------------------------------------- end-of-file