5 files changed, 21 insertions, 8 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
index 92bb2b1525..aba33e79d3 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -26,9 +26,11 @@ set -x
 sudo apt-get update
 
 # Create install directory
+u=`id -un`
+g=`id -gn`
 sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Install system tools and libraries
@@ -51,6 +53,10 @@ sudo apt-get -y install python-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
+sudo apt-get -y install libpcre3-dev libsqlite3-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 sudo apt-get -y install libevent-dev
 if [ "$?" != "0" ]; then
     exit $?
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 7a8e6e166c..303cd940d4 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -26,9 +26,11 @@ set -x
 sudo apt-get update
 
 # Create install directory
+u=`id -un`
+g=`id -gn`
 sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Install system tools and libraries
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
index aed2ec8efe..6fa4656c29 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
@@ -26,9 +26,11 @@ set -x
 sudo apt-get update
 
 # Create install directory
+u=`id -un`
+g=`id -gn`
 sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Download and run install script
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
index 183941aae6..ed40aa6b9c 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
@@ -26,9 +26,11 @@ set -x
 sudo apt-get update
 
 # Create install directory
+u=`id -un`
+g=`id -gn`
 sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Download and run install script
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index 04b72bf942..5e18be5025 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -233,6 +233,7 @@ fi
 cd $build
 
 # Build Mod_auth_openid
+sudo apt-get -y install libpcre3-dev libsqlite3-dev
 git clone git://github.com/jsdelfino/mod_auth_openid.git
 cd mod_auth_openid
 ./autogen.sh