Fix upgrade command.
This commit is contained in:
parent
03151e1af9
commit
829046af7f
3 changed files with 10 additions and 4 deletions
6
bin/lein
6
bin/lein
|
@ -91,7 +91,7 @@ BIN_DIR="$(dirname "$SCRIPT")"
|
|||
|
||||
# Try to make the default more sane for :eval-in :classloader.lein
|
||||
grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null &&
|
||||
LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}"
|
||||
LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx512m"}"
|
||||
|
||||
if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
|
||||
# Running from source checkout
|
||||
|
@ -127,7 +127,7 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
|
|||
fi
|
||||
|
||||
mkdir -p "$LEIN_DIR/target/classes"
|
||||
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS:--Xms64m -Xmx256m} -Dclojure.compile.path=$LEIN_DIR/target/classes"
|
||||
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx256m"} -Dclojure.compile.path=$LEIN_DIR/target/classes"
|
||||
add_path CLASSPATH "$LEIN_DIR/leiningen-core/src/" "$LEIN_DIR/leiningen-core/resources/" \
|
||||
"$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
|
||||
|
||||
|
@ -217,7 +217,7 @@ elif [ "$1" = "upgrade" ]; then
|
|||
exit 1
|
||||
else
|
||||
# TODO: change to stable when 2.0.0 is released
|
||||
TARGET_VERSION="${2:-'preview'}"
|
||||
TARGET_VERSION="${2:-preview}"
|
||||
echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
|
||||
echo -n "Do you want to continue [Y/n]? "
|
||||
read RESP
|
||||
|
|
|
@ -43,6 +43,7 @@ echo "Also deploy this release of leiningen-core to Clojars."
|
|||
# git commit -a -m "Release $RELEASE_VERSION"
|
||||
# git tag -s $RELEASE_VERSION -m "Release $RELEASE_VERSION"
|
||||
# cd leiningen-core; lein do clean, deploy clojars, marg
|
||||
# deploy leiningen itself
|
||||
# scp docs/uberdoc.html leiningen.org:leiningen.org/reference.html
|
||||
# git push && git push --tags
|
||||
# git checkout preview && git merge master && git push
|
||||
|
|
7
todo.org
7
todo.org
|
@ -13,7 +13,12 @@ See also https://github.com/technomancy/leiningen/issues
|
|||
- [X] Deploy and configure clojars promotion functionality
|
||||
- [X] Document releases repository on Clojars wiki
|
||||
- [X] Move downloads to S3 (#885)
|
||||
- [ ] missing dependency resolution output
|
||||
- [X] missing dependency resolution output
|
||||
- [X] Merge lein-newnew into lein proper
|
||||
- [X] Check for single-quote ${} in bin/lein
|
||||
- [ ] nrepl RC2
|
||||
- [ ] backslash issue in repl
|
||||
- [ ] newnew broken on windows
|
||||
- [ ] Prevent overwrites in Clojars (can happen post-RC)
|
||||
** 2.0.0-preview9
|
||||
- [X] Fast trampolining
|
||||
|
|
Loading…
Reference in a new issue