summaryrefslogtreecommitdiff
path: root/tools/strapcp
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-06-03 13:54:06 -0700
committerPaul Phillips <paulp@improving.org>2012-06-06 14:23:44 -0700
commita43e070e232ce35ef14fce34458ee3ea6e823078 (patch)
tree5d679372f53b6e650d81d87c4e0bd654ed9051c3 /tools/strapcp
parent6cdb6b0299cb917ac3df9e39aa932bacdc31faf9 (diff)
downloadscala-a43e070e232ce35ef14fce34458ee3ea6e823078.tar.gz
scala-a43e070e232ce35ef14fce34458ee3ea6e823078.tar.bz2
scala-a43e070e232ce35ef14fce34458ee3ea6e823078.zip
Updated tools/*cp scripts.
To include the asm classes in some cases, and also to improve with my sadly now-greater knowledge of shell scripting.
Diffstat (limited to 'tools/strapcp')
-rwxr-xr-xtools/strapcp12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/strapcp b/tools/strapcp
index 61e4a61b2c..6a46b4e1c8 100755
--- a/tools/strapcp
+++ b/tools/strapcp
@@ -1,8 +1,12 @@
#!/bin/sh
#
-THISDIR=`dirname $0`
-cp=`${THISDIR}/cpof ${THISDIR}/../build/strap/classes`
-fjbg=`${THISDIR}/abspath ${THISDIR}/../lib/fjbg.jar`
+dir=$(dirname $0)
+strap="$dir/../build/strap/classes"
+[[ -d $strap ]] || { echo "Error: no directory at $strap"; exit 1; }
-echo ${cp}:${fjbg}
+cp=$($dir/cpof $strap)
+fjbg=$($dir/abspath $dir/../lib/fjbg.jar)
+asm=$($dir/abspath $dir/../build/asm/classes)
+
+echo $cp:$fjbg:$asm