Merge branch 'master' into cache-test-results-jclc

testmycode · Jun 22, 2016 · 4130372 · 4130372
2 parents a142616 + b89a773
commit 4130372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -46,9 +46,9 @@ Now that you've installed tmc-cli, you can view all available commands by runnin
 Once installation is complete, you can log in using `tmc login`. This saves your TMC login information to a configuration file in ~/.config/tmc-cli/ (or %LOCALAPPDATA% on Windows) - you will only have to log in once.
 ```
 ~ $ tmc login
-username: my-username
-password:
 server address:
+username:
+password:
 Login successful.
 ```
 

diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java
@@ -36,10 +36,10 @@ public void getOptions(Options options) {
     @Override
     public void run(CommandLine args, Io io) {
         this.io = io;
+        String serverAddress = getLoginInfo(args, "s", "server address: ");
         String username = getLoginInfo(args, "u", "username: ");
         String password = getLoginInfo(args, "p", "password: ");
-        String serverAddress = getLoginInfo(args, "s", "server address: ");
-
+
         Settings settings = new Settings(serverAddress, username, password);
         if (loginPossible(settings) && saveLoginSettings(settings)) {
             io.println("Login successful.");