Added non-interactive checkout mode (to hopefully fix circleci finally)

yowshi · Aug 5, 2018 · 8c8b0cf · 8c8b0cf
1 parent 20677f7
commit 8c8b0cf
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/SetupThrive.rb b/SetupThrive.rb
@@ -117,16 +117,25 @@ def parseExtraArgs
 
   info "Checking assets"
 
+  isInteractive = $stdout.isatty
+
   if not File.exist? "assets"
 
     info "Getting assets"
 
+    params = ["svn", "checkout", "--username", $svnUser]
+
+    if !isInteractive
+      params.push "--non-interactive"
+    end
+
     if $svnPassword
-      system("svn", "checkout", "--username", $svnUser, "--password", $svnPassword,
-             WantedURL, "assets")
-    else
-      system("svn", "checkout", "--username", $svnUser, WantedURL, "assets")
+      params.push("--password", $svnPassword)
     end
+
+    params.push(WantedURL, "assets")
+
+    system(*params)
 
     if $?.exitstatus != 0
       onError "Failed to get thrive assets repository"