modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Intégration de la branche release-1.15.0

This commit is contained in:
Jephté Clain 2015-05-22 17:03:10 +04:00
parent 6b979d5a0c ec8114db78
commit 1dbb612e75
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -1,3 +1,8 @@
## Version 1.15.0 du 22/05/2015-17:03
e715087 Intégration de la branche update-upassword
a74a373 upassword: possibilité de spécifier de façon dynamique la ligne à afficher après
## Version 1.14.0 du 22/05/2015-16:41 ## Version 1.14.0 du 22/05/2015-16:41
d8f20c3 Intégration de la branche update-upassword d8f20c3 Intégration de la branche update-upassword

2
VERSION.txt
View File

@ -1 +1 @@
1.14.0 1.15.0

25
upassword
View File

@ -5091,24 +5091,27 @@ public class upassword {
private static final Pattern SPACES = Pattern.compile("\\s+"); private static final Pattern SPACES = Pattern.compile("\\s+");
private static final String BATCH_OPTION = "--batch";
private static final String AFTER_COMMAND = BATCH_OPTION + "-after ";
private static final int AFTER_COMMAND_STRIP = AFTER_COMMAND.length();
public static void main(String[] args) { public static void main(String[] args) {
upassword upassword = new upassword(); upassword upassword = new upassword();
if (args.length > 0 && args[0].equals("--batch")) { if (args.length > 0 && args[0].equals(BATCH_OPTION)) {
StringBuilder sb = new StringBuilder(); String after = null;
for (int i = 1; i < args.length; i++) {
if (i > 1) sb.append(" ");
sb.append(args[i]);
}
String after = sb.toString();
if (after.length() == 0) after = null;
BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
try { try {
while (true) { while (true) {
String line = br.readLine(); String line = br.readLine();
if (line == null) break; if (line == null) break;
upassword.run(SPACES.split(line)); if (line.startsWith(AFTER_COMMAND)) {
if (after != null) println(after); after = line.substring(AFTER_COMMAND_STRIP);
} else {
upassword.run(SPACES.split(line));
if (after != null) println(after);
}
} }
} catch (IOException e) { } catch (IOException e) {
die(null, e); die(null, e);