Merge pull request #174 from pontusmelke/4.0-file-not-connection

-f --file not a connection argument

Author: pontusmelke

cypher-shell/src/main/java/org/neo4j/shell/cli/CliArgHelper.java

@@ -168,8 +168,6 @@ private static ArgumentParser setupParser(ParameterMap parameterMap)
         connGroup.addArgument("-d", "--database")
                 .help("database to connect to. Can also be specified using environment variable " + ConnectionConfig.DATABASE_ENV_VAR)
                 .setDefault("");
-        connGroup.addArgument("-f", "--file")
-                .help("Pass a file with cypher statements to be executed. After the statements have been executed cypher-shell will be shutdown");
 
         MutuallyExclusiveGroup failGroup = parser.addMutuallyExclusiveGroup();
         failGroup.addArgument("--fail-fast")
@@ -229,6 +227,8 @@ private static ArgumentParser setupParser(ParameterMap parameterMap)
         parser.addArgument("cypher")
                 .nargs("?")
                 .help("an optional string of cypher to execute and then exit");
+        parser.addArgument("-f", "--file")
+                .help("Pass a file with cypher statements to be executed. After the statements have been executed cypher-shell will be shutdown");
 
         return parser;
     }