[Swift-commit] r5581 - SwiftApps/SciColSim

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-02-10 12:58:42 -0600 (Fri, 10 Feb 2012)
New Revision: 5581

Modified:
   SwiftApps/SciColSim/getswift.sh
Log:
Fixes to avoid some error messages


Modified: SwiftApps/SciColSim/getswift.sh
===================================================================
--- SwiftApps/SciColSim/getswift.sh	2012-02-10 18:50:32 UTC (rev 5580)
+++ SwiftApps/SciColSim/getswift.sh	2012-02-10 18:58:42 UTC (rev 5581)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 swiftrel=http://www.ci.uchicago.edu/swift/packages/swift-0.93.tar.gz
 tarfile=$(basename $swiftrel)
@@ -23,19 +23,20 @@
 tar zxf $tarfile
 
 echo
-echo Swift installed at $(pwd)/$release
+echo Swift installed at $PWD/$release
 echo
 
-rm -f swift # We expect this to be a symlink or non-existant
+if [ -e "swift" ]; then
+   rm -f swift # We expect this to be a symlink or non-existant
+fi
+
 ln -s $release swift
 
-./swift/bin/swift -version
+PATH=$PWD/swift/bin:$PATH
+$PWD/swift/bin/swift -version
 rm -f swift.log
 
 echo
 echo Swift installation complete.
 echo
 
-
-
-