Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
627 Commits 3 Branches 75 Tags 2.3 MiB
4e16a77a11
Commit Graph

627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Savchuk
4e16a77a11
Merge pull request #428 from renderorange/update-to-print-error-if-error-on-startup 
Add check for successful server startup
 2023-04-29 19:10:36 +12:00
Alexander Savchuk
3f5bab876b
Merge pull request #431 from Next-Door-Tech/cleanup 
Very minor - clean up extraneous whitespace
 2023-04-29 19:08:19 +12:00
Alexander Savchuk
711b15aa1e
Merge pull request #432 from Next-Door-Tech/git-release 
Fix the git-release GitHub Action workflow constantly creating errors
 2023-04-29 18:31:42 +12:00
Connor Gibson
471929a658
Remove workflow trigger for any push to master branch 2021-11-24 18:59:10 -08:00
Connor Gibson
75bd424932
Pin git-release workflow to version 4.x.x 
Done to prevent future issues due to major updates to git-release
 2021-11-24 18:58:59 -08:00
Connor Gibson
21677a3de3
Remove env ALLOW_TAG_PREFIX from build.yml 
Option was deprecated in git-release v4.0.0. No replacement is needed b/c msm's version tags do not have a static prefix before the version number. (i.e. tag name is "0.9.10", not "version-0.9.10")
 2021-11-24 18:58:49 -08:00
Connor Gibson
439771593b
Removed extraneous whitespace 2021-11-24 13:58:33 -08:00
Connor Gibson
a6c8855584
Added newline to end of file if missing 2021-11-24 13:58:33 -08:00
Connor Gibson
18f54ecb3c
Removed extra whitespace in whitespace-only lines 2021-11-24 13:58:33 -08:00
Blaine Motsinger
93f3b96d88 Add check for successful server startup 
The server_start function always assumes successful startup, which
is confusing if the server didn't actually start.

More work needs to be done to trap and return the error on startup,
but for now, this at least lets the admin know the server didn't
actually start.
 2021-11-13 16:48:48 -06:00
Alexander Savchuk
3c1e6ebadb
Merge pull request #418 from endofcake/master 
Add GitHub Action manifest
 2021-02-23 07:52:32 +00:00
Alexander Savchuk
1eb15e6b6e Add GitHub Action manifest 2021-02-07 19:31:25 +13:00
Alexander Savchuk
5c28b6fc5c
Merge pull request #416 from msmhq/fix-version 
Fix change log entry for version 0.10.0
 2021-02-07 18:14:38 +13:00
Alexander Savchuk
91e3b933a3 Fix change log entry for version 0.10.0 
Previous version of the entry had a typo in the version and
somehow missed the fact that there were a few other releases
in the last few years.

There's not much value in retroactively adding them to the change
log, but we should be more careful in the future.
 2021-01-28 00:29:08 +13:00
Alexander Savchuk
6c1d8c7c65 Bump version to 0.10.0 2020-12-03 22:43:11 +13:00
Alexander Savchuk
1e186a8821
Merge pull request #401 from renderorange/fix-bash-variable-expansion-for-debian-installer 
Fix bash variable expansion for Debian installer
 2020-12-03 22:21:05 +13:00
Alexander Savchuk
7680df5d79
Merge pull request #403 from renderorange/remove-invalid-java-invocation-arguments 
Remove invalid java invocation arguments
 2020-12-03 22:20:23 +13:00
Alexander Savchuk
901f02bb19
Merge pull request #405 from renderorange/convert-server-txt-files-to-json 
Convert server txt files to json
 2020-10-15 21:02:39 +13:00
Blaine Motsinger
fc954bc210 Update wl, bl, and op commands to not edit files 
This commit updates the wl, bl, and op commands to no longer edit
their corresponding server files.  msm still edits config settings
in files, but relies on minecraft server to manage it's own files,
passing the commands to the running server for changes.

Minecraft server moved to json in version 1.7.2 which made
directly editing txt files no longer work.

This change follows the pattern of the other passthrough commands
that if the server isn't running, returns error_exit informing the
user the server is not running.

Fixes issue #404
 2020-09-27 17:10:55 -05:00
Blaine Motsinger
4022d5a816 Convert default server txt files to json 
This commit changes the default server files from txt to json.

The only exception is ops.txt which is still populated with users
from DEFAULT_OPS_LIST on server creation.  Until msm is updated to
correctly populate ops.json on startup, msm relies on minecraft
server's mechanism to convert ops.txt.

Fixes issue #404
 2020-09-27 16:33:53 -05:00
Blaine Motsinger
5126e6623c Remove invalid java invocation arguments 
The UseConcMarkSweepGC, CMSIncrementalPacing, and AggressiveOpts
arguments are no longer supported in current versions of Java.
Java fails to start with them present.

Additionally, having less specific default invocation options
allows supporting more versions of Java and makes for less
maintenance into the future as options are deprecated.

Invocation options can be added to individual server configs, or
to the global config, if the user wants to change the defaults.

Fixes issue #402
 2020-09-26 23:43:46 -05:00
Blaine Motsinger
6f70d7b71f Fix bash variable expansion for Debian installer 
Fixes issue #400
 2020-09-26 17:02:50 -05:00
Alexander Savchuk
5b69c6a63f
Merge pull request #394 from tlindsay42/archive-cleanup 
Add configurable archive cleanup
 2020-09-24 21:07:16 +12:00
Troy Lindsay
da0832178c * [Reference](https://github.com/msmhq/msm/issues/50#issuecomment-7082834) 2020-07-19 10:35:19 -05:00
M-D-M
d8a6e8cbba
Merge pull request #352 from cebarks/patch-1 
Added new instantiated Systemd unit file
 2020-04-11 14:39:23 -04:00
Alexander Savchuk
30d6f6fd6c
Merge pull request #389 from SirJosh3917/patch-1 
add dollar sign for interpolation
 2020-03-31 21:14:37 +13:00
SirJosh3917
5bd2bc2a95
add dollar sign for interpolation 
i'm pretty sure this is useful, right?
 2019-11-28 21:29:21 -05:00
Alexander Savchuk
1b93ba85ce
Merge pull request #369 from danaak/master 
Allow snapshots to be downloaded
 2018-11-04 15:05:39 +13:00
Danaak
91dd313739 Check if jq is installed and cancel with message on failure 2018-11-01 11:54:56 -07:00
Danaak
33f99989bf Allow snapshots to download 2018-11-01 10:27:03 -07:00
Alexander Savchuk
3d6f46ec66
Bump version to 0.9.9 2018-10-10 22:35:05 +13:00
Alexander Savchuk
36aafd4092
Merge pull request #367 from Kadah/patch-1 
Enable universe repository on Ubuntu for jq package
 2018-10-10 22:33:30 +13:00
Kadah
0694e5dc74
Enable universe repository on Ubuntu for jq package 2018-10-04 15:22:56 -07:00
Alexander Savchuk
e7d649ff4f
Bump version to 0.9.8 2018-10-04 23:29:24 +13:00
Alexander Savchuk
e790b9de3b
Merge pull request #365 from pflueg/fix-download-vanilla-server 
Fix download vanilla server
 2018-10-04 23:16:43 +13:00
Ben Pflueg
dc290582eb Fix downloading latest file for minecraft jargroup 
- Use 'jq' as json interpreter instead of grep regex
- Use latest package format
 2018-10-01 19:44:06 +02:00
Ben Pflueg
2f1796bf86 Fix code indentions; Show path to eula.txt when it is not accepted yet 2018-10-01 19:35:31 +02:00
Alexander Savchuk
0311691f9b Try releasing a new version to fix version.json issue 2018-07-20 14:45:59 +12:00
Alexander Savchuk
b222218d3f
Merge pull request #363 from danaak/new-version-manifest 
Update to handle the new server urls
 2018-06-27 17:11:47 +12:00
Danaak
3d2224591b
Update to handle the new server urls 
aws pathing is no longer being updated. This grabs the latest package file and extracts the server jar
 2018-06-25 15:22:53 +07:00
M-D-M
59b137e8f5 Update version number to 0.9.5 to support #346 
Update version number to 0.9.5 to support pull #346
 2017-04-18 14:35:40 -04:00
M-D-M
375d19ed4a Merge pull request #346 from morbeo/patch-1 
Quoting a variable to avoid expansion
 2017-04-18 11:47:41 -04:00
Anten Skrabec
6fef7d8653 Added new instantiated Systemd unit file 
Allows for the individual control of msm servers with SystemD
 2017-01-18 15:51:51 -07:00
Vladimir Kirov
06207153ac Quoting to avoid expansion 
Should address #330 #327 and #319
 2016-10-26 22:01:14 +03:00
Blaine Motsinger
b932ccb71b Merge pull request #326 from tmad40blue/patch-1 
Typo fix
 2016-03-27 14:16:13 -05:00
Dylan Larkins
361e3e1382 Typo fix 
"Upcoming" on the main page was misspelled as "upcomming". Fixed for you =)
 2016-01-18 23:42:15 -05:00
Zach Latta
9b3bdded84 Merge pull request #325 from tcyrus/patch-1 
Fix Build Failure
 2016-01-15 16:29:20 -08:00
Timothy Cyrus
fb3e09f4e5 Update .travis.yml 
Should fix Build Failure
Updates Package Listings Before Installing `shunit2`
 2016-01-15 19:23:29 -05:00
Zach Latta
97784b4588 Merge pull request #324 from tcyrus/patch-1 
Update README.markdown
 2016-01-15 13:48:31 -08:00
Timothy Cyrus
f878a6a382 Update README.markdown 2016-01-15 16:28:18 -05:00