From 0455fa4fee1adbd14ff25865d907cc88f270ed3a Mon Sep 17 00:00:00 2001
From: Dan Dascalescu <ddascalescu+github@gmail.com>
Date: Tue, 25 Aug 2015 20:26:46 -0700
Subject: [PATCH] Simplify running the example

---
 meteor/example/.meteor/packages |  2 --
 meteor/example/.meteor/release  |  2 +-
 meteor/example/.meteor/versions |  8 ++++----
 meteor/example/README.md        | 17 ++++++++---------
 meteor/example/run.bat          | 11 +++++++----
 meteor/example/run.sh           | 14 ++------------
 meteor/runtests.bat             |  2 +-
 7 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/meteor/example/.meteor/packages b/meteor/example/.meteor/packages
index a33b0ed..6f65fb7 100644
--- a/meteor/example/.meteor/packages
+++ b/meteor/example/.meteor/packages
@@ -7,6 +7,4 @@ meteor-platform
 autopublish
 insecure
 rubaxa:sortable
-dburles:mongo-collection-instances
 fezvrasta:bootstrap-material-design
-# twbs:bootstrap
diff --git a/meteor/example/.meteor/release b/meteor/example/.meteor/release
index dab6b55..315c635 100644
--- a/meteor/example/.meteor/release
+++ b/meteor/example/.meteor/release
@@ -1 +1 @@
-METEOR@1.1.0.2
+METEOR@1.1.0.3
diff --git a/meteor/example/.meteor/versions b/meteor/example/.meteor/versions
index abcbcf0..a65be54 100644
--- a/meteor/example/.meteor/versions
+++ b/meteor/example/.meteor/versions
@@ -7,7 +7,7 @@ blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
 check@1.0.5
-dburles:mongo-collection-instances@0.3.3
+dburles:mongo-collection-instances@0.3.4
 ddp@1.1.0
 deps@1.0.7
 ejson@1.0.6
@@ -21,7 +21,7 @@ id-map@1.0.3
 insecure@1.0.3
 jquery@1.11.3_2
 json@1.0.3
-lai:collection-extensions@0.1.3
+lai:collection-extensions@0.1.4
 launch-screen@1.0.2
 livedata@1.0.13
 logging@1.0.7
@@ -39,13 +39,13 @@ reactive-var@1.0.5
 reload@1.1.3
 retry@1.0.3
 routepolicy@1.0.5
-rubaxa:sortable@1.2.0
+rubaxa:sortable@1.2.1
 session@1.1.0
 spacebars@1.0.6
 spacebars-compiler@1.0.6
 templating@1.1.1
 tracker@1.0.7
-twbs:bootstrap@3.3.4
+twbs:bootstrap@3.3.5
 ui@1.0.6
 underscore@1.0.3
 url@1.0.4
diff --git a/meteor/example/README.md b/meteor/example/README.md
index 51d1547..75c3d63 100644
--- a/meteor/example/README.md
+++ b/meteor/example/README.md
@@ -9,28 +9,27 @@ It also shows list grouping and control over what lists can give or receive
 elements. You can only drag elements from the list to the left onto the list
 to the right.
 
+
 ## Usage
 
-The example uses the local package from the checkout, so it needs to wire
-up some files (`package.js` and `package.json`). This is done by the handy
-run script:
+The example uses the local package from the checkout, with the help of the run script:
 
 ### Windows
 
     git clone https://github.com/RubaXa/Sortable.git
     cd Sortable
-    git checkout dev
-    cd meteor\example
-    run.bat
+    # git checkout dev  # optional
+    meteor\example\run.bat
 
 ### Elsewhere
 
     git clone https://github.com/RubaXa/Sortable.git
     cd Sortable
-    git checkout dev
-    meteor/example./run.sh
+    # git checkout dev  # optional
+    meteor/example/run.sh
+
 
-## Prior art
+## [Prior art](http://slides.com/dandv/prior-art)
 
 ### Differential
 
diff --git a/meteor/example/run.bat b/meteor/example/run.bat
index a6d845a..b2a0d8b 100755
--- a/meteor/example/run.bat
+++ b/meteor/example/run.bat
@@ -1,4 +1,7 @@
-mklink ..\..\package.js "meteor/package.js"
-mklink package.json "../../package.json"
-meteor run
-del ..\..\package.js package.json
+@echo off
+REM Sanity check: make sure we're in the directory of the script
+set DIR=%~dp0
+cd %DIR%
+
+set PACKAGE_DIRS=..\..\
+meteor run %*
diff --git a/meteor/example/run.sh b/meteor/example/run.sh
index aab44ab..8a9123a 100755
--- a/meteor/example/run.sh
+++ b/meteor/example/run.sh
@@ -1,15 +1,5 @@
 # sanity check: make sure we're in the root directory of the example
 cd "$( dirname "$0" )"
 
-# delete temp files even if Ctrl+C is pressed
-int_trap() {
-  echo "Cleaning up..."
-}
-trap int_trap INT
-
-ln -s "meteor/package.js" ../../package.js 2>/dev/null
-ln -s "../../package.json" package.json 2>/dev/null
-
-meteor run "$@"
-
-rm ../../package.js package.json
+# let Meteor find the local package
+PACKAGE_DIRS=../../ meteor run "$@"
diff --git a/meteor/runtests.bat b/meteor/runtests.bat
index 87422f0..9bddf93 100644
--- a/meteor/runtests.bat
+++ b/meteor/runtests.bat
@@ -1,5 +1,5 @@
-REM Test Meteor package before publishing to Atmospherejs.com
 @echo off
+REM Test Meteor package before publishing to Atmospherejs.com
 
 REM Sanity check: make sure we're in the directory of the script
 set DIR=%~dp0