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
581 Commits 3 Branches 75 Tags 2.3 MiB
9b3bdded84
Commit Graph

581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tristan Donkers
6a48129c0e bumped version and update changelog 2015-10-07 17:20:38 +11:00
donkers
1c5ada24f9 Merge pull request #310 from donkers/master 
Versionable Properties
 2015-10-07 17:15:17 +11:00
Tristan Donkers
299d2b0b00 Prevent info about unset server version being printed during logroll or config command 2015-09-22 03:07:00 +10:00
Tristan Donkers
556733d192 Fix bug where in some situations $SERVER_PATH was being prepended to $*_PATH variables unnecessarily. 2015-09-12 13:16:59 +10:00
Tristan Donkers
7646dfa403 Missed a ; in the versionable_properties list. Damn it. 2015-09-06 13:03:18 +10:00
Tristan Donkers
911ba13b05 Change case of local versionable_properties to match precedence. 2015-09-06 12:59:13 +10:00
Tristan Donkers
c41ba62dab Defined a list of properties that can be versioned, the regex filter was not strict enough. 2015-09-06 12:37:46 +10:00
Tristan Donkers
d38a328324 Merge branch 'versionable_properties' 2015-08-29 15:20:44 +10:00
Tristan Donkers
66c60976b5 Applied the 'script /dev/null' fix to the screen -r command in the command_server_console() function. 2015-08-29 14:43:09 +10:00
Tristan Donkers
af13191bb2 refactor of server_set_property(), move content of if block into the case statement and check if path is already absolute. 2015-08-28 23:25:28 +10:00
Tristan Donkers
0a637b82b7 Call read_server_conf() when reading set_property lines in versioning files. This allows overrides of version properties in the server.properties. 2015-08-23 11:32:02 +10:00
Tristan Donkers
f4d0c14aab Moved the server.properties checking to it's own function, read_server_conf(). 2015-08-23 11:26:30 +10:00
Tristan Donkers
ef2a6c537c Code re-factoring: Move case statment applying post-changes to values to the server_set_property() function. 2015-08-23 11:18:38 +10:00
Tristan Donkers
7f11ec62d5 Add LOG_PATH to version files. 2015-08-23 10:10:04 +10:00
Tristan Donkers
64e14e5b16 Only return 0 if this is a CONSOLE_ variable. 2015-08-23 10:08:59 +10:00
Tristan Donkers
9b60033c24 Change if conditions so versioning files are read for *_PATH as well as CONSOLE_* variables. 2015-08-23 10:07:31 +10:00
Tristan Donkers
3e9e72e128 Move the if block for making paths absolute into the server_set_property() function. 2015-08-23 10:06:14 +10:00
Tristan Donkers
4f85edb958 Use the server_set_property() function to set property values in all cases. 2015-08-23 10:00:51 +10:00
Tristan Donkers
a0850d7595 Add set_property() function to load properties from versioning files. 2015-08-23 09:56:54 +10:00
Blaine Motsinger
ce0ea447a4 bumped version 2015-08-22 11:04:57 -05:00
Blaine Motsinger
cdfbf216ce updated for 0.9.3 2015-08-22 11:03:50 -05:00
Blaine Motsinger
b27e2c3100 Merge pull request #308 from donkers/master 
pre and post 1.7.0 log support
 2015-08-22 10:47:52 -05:00
Tristan Donkers
511f94b213 Update LOG_PATH for Minecraft 1.7.0. This will need to be manually set for versions < 1.7.0 until this is made a version-able property. 2015-08-21 17:52:07 +10:00
Tristan Donkers
5741f28980 Add minecraft/1.7.0 to versioning manifest file. 2015-08-18 19:15:04 +10:00
Tristan Donkers
73d4782e6e No longer required now tail has --follow=name --retry 2015-08-15 04:19:26 +10:00
Tristan Donkers
d6c7a08126 Hide errors from tail if server log get rolled during command_server_cmdlog(), server_log_get_line() or server_log_dots_for_lines(). 2015-08-15 04:13:55 +10:00
Tristan Donkers
d2467fba9a Add retry to tail, for cases where server rolls own log. 2015-08-15 02:39:47 +10:00
Tristan Donkers
6386814d46 Fix escaping fail on awk command in log_line_get_time() 2015-08-15 02:37:07 +10:00
Tristan Donkers
c3968de617 Add 1.7.0 versioning file. 2015-08-15 01:28:35 +10:00
Tristan Donkers
621963cf1c Update awk comand for time_string to support pre and post 1.7 log format 2015-08-15 01:28:28 +10:00
Tristan Donkers
c8c4788091 Moved LOG_REGEX variable to versioning file. 2015-08-14 02:46:28 +10:00
Blaine Motsinger
ce84d731b9 Merge pull request #307 from cptskyhawk/patch-1 
Update debian.sh install script to set update-rc.d symlink names for better priority.
 2015-08-09 23:47:35 -05:00
cptskyhawk
9d2b63f2b5 Update debian.sh 
Update debian.sh script to eliminate "Cannot make directory '/var/run/screen': Permission denied" error on startup with Ubuntu 14.04 -- more information: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/1380080
 2015-08-06 10:13:24 -05:00
Marcus Whybrow
4f90d9453a Don't exit if single server is blocked by EULA 2015-07-26 01:22:08 +01:00
Marcus Whybrow
09ac4a93fc Correct grammar for "an EULA" message 2015-07-25 08:00:17 +01:00
Marcus Whybrow
ffff59c6cb Remove unnecessary whitespace (thanks Atom) 2015-07-25 07:48:56 +01:00
Marcus Whybrow
0455eb0236 Use error_exit() to report eula error message 2015-07-25 07:47:58 +01:00
Blaine Motsinger
52a0581d10 updated changelog for 0.9.2 2015-07-25 04:36:48 +00:00
Blaine Motsinger
d8e24f28a3 Added check for eula=true, as discussed in Issue #271 2015-07-25 04:31:33 +00:00
Blaine Motsinger
e2ff72f76d updated changelog for 0.9.1 2015-07-23 13:02:57 +00:00
Blaine Motsinger
b4eeb39094 Merge pull request #298 from renderorange/backwards_compat_fixes 
Version target correction
 2015-07-23 07:43:37 -05:00
Blaine Motsinger
40e73a20e6 Changed default target to minecraft in common.sh. 2015-07-22 21:30:25 +00:00
Blaine Motsinger
c9c4b2e55f Corrected logic in init/msm to allow for download of release or snapshot, while maintaining backwards compatibility. 2015-07-22 21:29:16 +00:00
Blaine Motsinger
2ddcf9286d bumper version number for patch changes 2015-07-22 13:18:20 +00:00
Marcus Whybrow
02ece2d2b3 Remove PR prefix and fix broken link 2015-07-20 18:40:37 +01:00
Marcus Whybrow
233fb2b37d Update CHANGELOG to include all 0.9.0 changes 2015-07-20 18:38:37 +01:00