Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

util

Clone or download

work

Download Browse
+43 −13
Debayan Sutradhar (rnayabed) 2021-02-12 15:56
Debayan Sutradhar (rnayabed) 2021-02-12 15:56
a1c335c9e16d2dabdecaa3b8ab2bae9ed079e4da
51c213d0ee6bfaf759b02f39388f6c5a05ec2f0c
git #util/a1c335c9e16d2dabdecaa3b8ab2bae9ed079e4da

Modified Files

List
Side by side diff
M pom.xml
+1 −0
--- 'a/pom.xml'
+++ b/pom.xml
@@ -73,6 +73,7 @@
<artifactId>ikonli-javafx</artifactId>
<version>${IkonliVersion}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
M src/main/java/com/stream_pi/util/comms/Message.java
+3 −3
--- 'a/src/main/java/com/stream_pi/util/comms/Message.java'
+++ b/src/main/java/com/stream_pi/util/comms/Message.java
@@ -8,14 +8,14 @@ public class Message implements Serializ
private String[] stringArrValue;
private String stringValue;
- private byte[] byteArrValue;
+ private Byte[] byteArrValue;
public Message(String header)
{
this.header = header;
}
- public void setByteArrValue(byte[] byteArrValue)
+ public void setByteArrValue(Byte[] byteArrValue)
{
this.byteArrValue = byteArrValue;
}
@@ -35,7 +35,7 @@ public class Message implements Serializ
return header;
}
- public byte[] getByteArrValue()
+ public Byte[] getByteArrValue()
{
return byteArrValue;
}
M src/main/java/com/stream_pi/util/startatboot/StartAtBoot.java
+39 −10
--- 'a/src/main/java/com/stream_pi/util/startatboot/StartAtBoot.java'
+++ b/src/main/java/com/stream_pi/util/startatboot/StartAtBoot.java
@@ -39,7 +39,19 @@ public class StartAtBoot {
if(platform == Platform.WINDOWS)
createStarterForWindows(runnerFile);
else if(platform == Platform.LINUX || platform == Platform.LINUX_RPI)
- createStarterForLinux(runnerFile);
+ createStarterForLinux(runnerFile, true);
+ else if(platform == Platform.MAC)
+ createStarterForMac(runnerFile);
+ else if(platform == Platform.UNKNOWN)
+ unknownPlatformException();
+ }
+
+ public void create(File runnerFile, boolean isXMode) throws MinorException
+ {
+ if(platform == Platform.WINDOWS)
+ createStarterForWindows(runnerFile);
+ else if(platform == Platform.LINUX || platform == Platform.LINUX_RPI)
+ createStarterForLinux(runnerFile, isXMode);
else if(platform == Platform.MAC)
createStarterForMac(runnerFile);
else if(platform == Platform.UNKNOWN)
@@ -59,7 +71,7 @@ public class StartAtBoot {
return false;
}
- private void createStarterForLinux(File runnerFile) throws MinorException
+ private void createStarterForLinux(File runnerFile, boolean isXMode) throws MinorException
{
try
{
@@ -74,14 +86,31 @@ public class StartAtBoot {
FileWriter fw = new FileWriter(sysDServiceFile);
BufferedWriter bw = new BufferedWriter(fw);
- bw.write("[Unit]\n" +
- "Description=Stream-Pi "+softwareType+"\n" +
- "[Service]\n" +
- "Type=oneshot\n" +
- "WorkingDirectory="+runnerFile.getAbsoluteFile().getParent()+"\n" +
- "ExecStart="+runnerFile.getAbsoluteFile().getParent()+"/"+runnerFile.getName()+"\n" +
- "[Install]\n" +
- "WantedBy=default.target\n");
+
+ if(isXMode)
+ {
+ bw.write("[Unit]\n" +
+ "Description=Stream-Pi "+softwareType+"\n" +
+ "[Service]\n" +
+ "Type=simple\n" +
+ "Environment=\"DISPLAY=:0\"\n" +
+ "WorkingDirectory="+runnerFile.getAbsoluteFile().getParent()+"\n" +
+ "ExecStart="+runnerFile.getAbsoluteFile().getParent()+"/"+runnerFile.getName()+"\n" +
+ "[Install]\n" +
+ "WantedBy=default.target\n");
+ }
+ else
+ {
+ bw.write("[Unit]\n" +
+ "Description=Stream-Pi "+softwareType+"\n" +
+ "[Service]\n" +
+ "Type=oneshot\n" +
+ "WorkingDirectory="+runnerFile.getAbsoluteFile().getParent()+"\n" +
+ "ExecStart="+runnerFile.getAbsoluteFile().getParent()+"/"+runnerFile.getName()+"\n" +
+ "[Install]\n" +
+ "WantedBy=default.target\n");
+ }
+
bw.close();
Runtime.getRuntime().exec("systemctl --user daemon-reload");