Skip to content

Commit

Permalink
Merge branch 'issue_66'
Browse files Browse the repository at this point in the history
  • Loading branch information
dalehenrich committed Mar 6, 2015
2 parents 8fdc73f + 95a3064 commit 3b07266
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
9 changes: 2 additions & 7 deletions bin/installPharo
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,5 @@ fi
# Download Pharo

cd $GS_HOME/pharo
if [ "${GS_TRAVIS}x" = "x" ] ; then
wget -O- get.pharo.org/vmLatest | bash
else
# running on travis server
wget -O- get.pharo.org/travis+vmLatest | bash
fi
wget -O- get.pharo.org/stable | bash
wget -O- get.pharo.org/vmLatest | bash
wget -O- get.pharo.org/30 | bash
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ version100: spec
with: [
spec
loads: 'GemStone Dev';
repository: 'github://dalehenrich/tode:master/repository' ];
repository: 'github://dalehenrich/tode:v0.0.2/repository' ];
postLoadDoIt: #post30Load;
yourself ]
yourself ]
6 changes: 3 additions & 3 deletions tode/server/scripts/installTode.ws
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"Fourth and final step in tODE installation process: install tODE."
Transcript
cr;
show: '-----Upgrading tODE to latest master version'.
show: '-----Upgrading tODE to latest 0.0.? tag'.
GsDeployer bulkMigrate: [
Metacello new
baseline: 'Tode';
repository: 'github://dalehenrich/tode:master/repository';
repository: 'github://dalehenrich/tode:0.0.?/repository';
get.
Metacello new
baseline: 'Tode';
repository: 'github://dalehenrich/tode:master/repository';
repository: 'github://dalehenrich/tode:0.0.?/repository';
onConflict: [ :ex | ex allow ];
load: 'GemStone Dev' ].

0 comments on commit 3b07266

Please sign in to comment.