smossy/Priestess
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added build number to version readout.

Browse Source
This commit is contained in:
Sandy Mossgrave 2023-05-08 00:15:39 +00:00
parent 713c0f068a
commit 4bbcbcf290
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -3,3 +3,7 @@
/priestessconfig.txtbkup /priestessconfig.txtbkup
/target/ /target/
dependency-reduced-pom.xml dependency-reduced-pom.xml
buildNumber.properties
.classpath
.project
.settings/

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.tinyplantnews.priestess</groupId> <groupId>com.tinyplantnews.priestess</groupId>
<artifactId>Priestess</artifactId> <artifactId>Priestess</artifactId>
<name>Priestesss of the Bean Goose Cult</name> <name>Priestesss of the Bean Goose Cult</name>
<version>0.1</version> <version>0.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<scm> <scm>
<connection>scm:git:https://tinyplantnews.com/git/Priestess.git</connection> <connection>scm:git:https://tinyplantnews.com/git/Priestess.git</connection>

5
src/main/java/com/tinyplantnews/priestess/Configuration.java
View File

@ -209,7 +209,7 @@ public class Configuration {
private static Properties getJarProperties() { private static Properties getJarProperties() {
Properties props = new Properties(); Properties props = new Properties();
try { try {
props.load(Configuration.class.getClassLoader().getResourceAsStream("version/version.properties")); props.load(Configuration.class.getClassLoader().getResourceAsStream("version.properties"));
} catch (IOException e) { } catch (IOException e) {
log.log(Level.SEVERE, "Problem encountered while loading basic jar properties: {0}", e); log.log(Level.SEVERE, "Problem encountered while loading basic jar properties: {0}", e);
return null; return null;
@ -219,15 +219,18 @@ public class Configuration {
public static final String PROGNAME; public static final String PROGNAME;
public static final String VERSION; public static final String VERSION;
public static final String BUILD;
static { static {
Properties props = getJarProperties(); Properties props = getJarProperties();
if (props == null) { if (props == null) {
PROGNAME = "Priestess, probably"; PROGNAME = "Priestess, probably";
VERSION = "(version unknown)"; VERSION = "(version unknown)";
BUILD = "(unknown build number)";
} else { } else {
PROGNAME = props.getProperty("progname"); PROGNAME = props.getProperty("progname");
VERSION = props.getProperty("version"); VERSION = props.getProperty("version");
BUILD = props.getProperty("build");
} }
} }

3
src/main/java/com/tinyplantnews/priestess/Priestess.java
View File

@ -41,6 +41,7 @@ import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import static com.tinyplantnews.priestess.Configuration.PROGNAME; import static com.tinyplantnews.priestess.Configuration.PROGNAME;
import static com.tinyplantnews.priestess.Configuration.VERSION; import static com.tinyplantnews.priestess.Configuration.VERSION;
import static com.tinyplantnews.priestess.Configuration.BUILD;
/** /**
* *
@ -863,7 +864,7 @@ public class Priestess {
public final Callback listCommandsCommand = new Callback() { public final Callback listCommandsCommand = new Callback() {
@Override @Override
public Publisher<Mono> apply(CommandArgs o) { public Publisher<Mono> apply(CommandArgs o) {
o.replyWith(PROGNAME + " " + VERSION); o.replyWith(PROGNAME + " " + VERSION + " build number " + BUILD);
for (String name : Command.commands.keySet()) { for (String name : Command.commands.keySet()) {
o.replyWith(" Help for command " + name + ": " + Command.commands.get(name).getHelp()); o.replyWith(" Help for command " + name + ": " + Command.commands.get(name).getHelp());
} }

3
src/main/java/com/tinyplantnews/priestess/version/version.properties Normal file
View File

@ -0,0 +1,3 @@
progname=${name}
version=${version}
build=${buildNumber}