Skip to content
Browse files

Merge pull request #20 from petermelias/master

Fixed two SEVERE bugs (build breakers in fact) in the storm build portion of deploy script
  • Loading branch information...
2 parents ad86460 + ab0d986 commit 868894fcc17ead21210072b9bcc4b90890b74461 @jasonjckn jasonjckn committed Jan 30, 2013
Showing with 24 additions and 17 deletions.
  1. +24 −17 src/clj/backtype/storm/crate/storm.clj
View
41 src/clj/backtype/storm/crate/storm.clj
@@ -55,24 +55,31 @@
))
(defn get-release [request release]
- (-> request
- (exec-script/exec-checked-script
- "Build storm"
-
- (cd "$HOME")
- (mkdir -p "build")
- (cd "$HOME/build")
- (when-not (directory? "storm")
- (if ~release
- (git clone -b ~release "git://github.com/nathanmarz/storm.git")
- (git clone "git://github.com/nathanmarz/storm.git")))
-
- (cd storm)
- (git pull)
- (sh "bin/build_release.sh")
- (cp "*.zip $HOME/")
+ (let [url "git://github.com/nathanmarz/storm.git"
+ rl (if (empty? release) "" release)] ; empty string for pallet
+
+ (-> request
+ (exec-script/exec-checked-script
+ "Build storm"
+ (cd "$HOME")
+ (mkdir -p "build")
+ (cd "$HOME/build")
+
+ (when-not (directory? "storm")
+ (if (not (empty? ~rl)) ; Check for release, use branch if present
+ (git clone -b ~rl ~url)
+ (git clone ~url) ; Default to master branch
+ )
+ )
+
+ (cd storm)
+ (git pull)
+ (bash "bin/build_release.sh")
+ (cp "*.zip $HOME/")
)
- ))
+ )
+ )
+)
(defn make [request release]
(->

0 comments on commit 868894f

Please sign in to comment.
Something went wrong with that request. Please try again.