Fixed a few things that didn't work well
This commit is contained in:
10
mineserve
10
mineserve
@ -13,25 +13,23 @@ status() {
|
|||||||
tail -n +$LAST_STATUS logs/latest.log
|
tail -n +$LAST_STATUS logs/latest.log
|
||||||
echo
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
serve() {
|
|
||||||
java -Xms1G -Xmx5G -jar server.jar nogui
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
if test -f "$PID"; then
|
if test -f "$PID"; then
|
||||||
echo "Server already running with pid: $(cat $PID)"
|
echo "Server already running with pid: $(cat $PID)"
|
||||||
status
|
status
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
screen -S minecraft -dm java -Xms1G -Xmx5G -jar server.jar nogui
|
screen -S minecraft -dm java -Xms1G -Xmx5G -jar server.jar nogui
|
||||||
pgrep -P "$(screen -list | sed -E -n 's/\s*([0-9]+).minecraft.*/\1/p')" > $PID
|
pgrep -P "$(screen -list | sed -E -n 's/\s*([0-9]+).minecraft.*/\1/p')" > $PID
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
|
if test -f "$PID"; then
|
||||||
SCREEN_PID=$(screen -list | sed -E -n 's/\s*([0-9]+).minecraft.*/\1/p')
|
SCREEN_PID=$(screen -list | sed -E -n 's/\s*([0-9]+).minecraft.*/\1/p')
|
||||||
screen -S minecraft -X stuff "stop
|
screen -S minecraft -X stuff "stop
|
||||||
"
|
"
|
||||||
|
echo -n "Waiting for shutdown..."
|
||||||
# kill -0 checks if a process is running
|
# kill -0 checks if a process is running
|
||||||
while kill -0 $SCREEN_PID 2> /dev/null; do
|
while kill -0 $SCREEN_PID 2> /dev/null; do
|
||||||
sleep 3
|
sleep 3
|
||||||
|
3
rdify
3
rdify
@ -26,11 +26,10 @@ class RamDiskItem():
|
|||||||
self.persist.mkdir(parents=True, exist_ok=True)
|
self.persist.mkdir(parents=True, exist_ok=True)
|
||||||
self.ramdisk.mkdir(parents=True, exist_ok=True)
|
self.ramdisk.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
|
||||||
if self.target.is_file():
|
if self.target.is_file():
|
||||||
shutil.copy2(self.target, self.ramdisk)
|
shutil.copy2(self.target, self.ramdisk)
|
||||||
else:
|
else:
|
||||||
shutil.copytree(self.target, self.full_rd_path)
|
shutil.copytree(self.target, self.full_rd_path, dirs_exist_ok=True)
|
||||||
shutil.move(self.target, self.persist)
|
shutil.move(self.target, self.persist)
|
||||||
|
|
||||||
os.symlink(self.full_rd_path, self.target)
|
os.symlink(self.full_rd_path, self.target)
|
||||||
|
Reference in New Issue
Block a user