[med-svn] [vista-foia] 01/01: Fixed crafted dirs in vista instance deployment.

[Luis Ibanez]

This is an automated email from the git hooks/post-receive script.

luisibanez-guest pushed a commit to branch master
in repository vista-foia.

commit b28e399e91ca3233cd401dffe359497035471945
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Sat Feb 1 21:36:19 2014 -0500

    Fixed crafted dirs in vista instance deployment.
    
    Adjusted directories to what is being used in the vista-foia package.
---
 debian/deploy/createVistaInstance.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/deploy/createVistaInstance.sh b/debian/deploy/createVistaInstance.sh
index 893c7ad..4f7cda7 100755
--- a/debian/deploy/createVistaInstance.sh
+++ b/debian/deploy/createVistaInstance.sh
@@ -75,11 +75,12 @@ else
 fi
 
 # VistA base installation
-vista_dir=/usr/share/vista-foia
+vista_dir=/usr/share/vista-foia/V-0.20130405
+vista_instance_template=$vista_dir/deploy
 
 # Find GT.M:
 gtm_ver=6.0-003
-gtm_dist=/usr/lib/fis-gtm/{gtm_ver}_{gtm_arch}
+gtm_dist=/usr/lib/fis-gtm/V${gtm_ver}_${gtm_arch}
 gtmver=$gtm_ver
 
 # $basedir is the base directory for the instance
@@ -118,8 +119,8 @@ su $instance -c "cp -R $vista_dir/g/database.gld $basedir/g/${instance}.gld"
 su $instance -c "cp -R $vista_dir/g/database.dat $basedir/g/${instance}.dat"
 
 # Copy standard etc and bin items from repo
-su $instance -c "cp -R instance/etc $basedir"
-su $instance -c "cp -R instance/bin $basedir"
+su $instance -c "cp -R $vista_instance_template/etc $basedir"
+su $instance -c "cp -R $vista_instance_template/bin $basedir"
 
 # Modify xinetd.d scripts to reflect $instance
 perl -pi -e 's/foia/'$instance'/g' $basedir/bin/*.sh
@@ -154,7 +155,7 @@ chown $instance:$instance $basedir/etc/env
 echo "source $basedir/etc/env" >> $basedir/.bashrc
 
 # Setup base gtmroutines
-gtmroutines="$basedir/r/$gtmver($basedir/r) $vista_dir/o($vista_dir/r)"
+gtmroutines="$basedir/r/$gtmver($basedir/r) $vista_dir/r"
 
 # 64bit GT.M can use a shared library instead of $gtm_dist
 # TODO: libgtmutil.so isn't being generated by gtminstall, need to figure out what is going on

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista-foia.git