cotugno/mscs
2
Fork 0
mirror of https://github.com/MinecraftServerControl/mscs.git synced 2024-11-15 14:58:18 -07:00
Code Issues Packages Projects Releases Wiki Activity
406 Commits 5 Branches 12 Tags 1.5 MiB
5a0bf6437f
Commit Graph

406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason M. Wood
5a0bf6437f Merge pull request #93 from jjchico/check-permissions 
Check permissions
 2015-08-06 15:09:03 -06:00
Jason M. Wood
d99756b8a7 Merge pull request #92 from jjchico/misc-fixing 
Misc fixing
 2015-08-06 15:06:46 -06:00
Jorge Juan
ed6c3729a1 Permissions check fixing 
* ls/list can now be executed by unprivileged users
  * Privileges are now needed to restore backups
  * Old config is migrated only if executed by a privileged user
 2015-08-06 22:17:33 +02:00
Jorge Juan
642074ddec Use -z instead of ! -n in conditions 2015-08-06 21:41:17 +02:00
Jorge Juan
8765946f4b Fix some wrong arguments to queryNumUsers 2015-08-06 21:41:16 +02:00
Jorge Juan
9fc4d04bd7 Improve world's available/enable state checking 
* Use isWorldAvailable and isWorldEnabled consistently
  * Other minor related changes
 2015-08-06 21:40:44 +02:00
Jason M. Wood
c53bf0689d Merge pull request #89 from jjchico/query-fixes 
Query fixes
 2015-08-05 12:17:23 -06:00
Jorge Juan
d50a11e9ac Correct 0-padding format in printf 2015-08-05 11:22:37 +02:00
Jorge Juan
57c0dfa628 Added wrapper method to query the number of users 
* May sove issue #65
 2015-08-05 11:17:59 +02:00
Jason M. Wood
ad3c38db13 Merge pull request #88 from jjchico/smarter-restore 
Smarter and safer worldBackupRestore
 2015-08-03 12:27:51 -06:00
Jason M. Wood
367182eee2 Merge pull request #87 from jjchico/usage-function 
Move 'usage' info to a function
 2015-08-03 12:25:33 -06:00
Jorge Juan
0f3fdb43bc Smarter and safer worldBackupRestore 
* Backup prior to restore is done outside worldBackupRestore
    to improve reusability of the method.
  * Restoration is cancelled if the world cannot be backed-up first
  * Restoration is done in a tmp dir first and world is overwritten
    only if successful
  * Fixes issue #82
 2015-08-03 10:08:26 +02:00
Jorge Juan
56aa1dc076 Move 'usage' info to a function 
Improves eficiency avoiding to load the usage text in memory three times.
 2015-08-03 01:30:45 +02:00
Jason M. Wood
bc22934da5 Don't change the permissions 2015-08-02 13:38:13 -06:00
Jason M. Wood
f1f6324f03 Merge pull request #86 from jjchico/ret-val 
Change method return values to real return values not stdout
 2015-08-02 13:37:13 -06:00
Jorge Juan
305ab21a80 Change wrong doxygen @stdout to @return 2015-08-02 00:14:22 +02:00
Jorge Juan
b6ae5db712 Add return value to worldBackup 2015-08-02 00:01:13 +02:00
Jorge Juan
8945699763 Change method return values to real ret values not stdout 
* isWorldAvailable, runningWorld, etc.
* less code
* faster code
* easier code
 2015-08-02 00:01:13 +02:00
Jason M. Wood
b97402e7a2 Merge pull request #83 from jjchico/fix-restore 
Fix restore
 2015-07-29 13:13:37 -06:00
Jorge Juan
03dc742dc3 Refuse to restore backup if server is running 2015-07-29 10:49:02 +02:00
Jorge Juan
686a9006db Restore backup partial fix 
* Force overwrite on backup restore
* Fix date-time spec in list-backup so it can be fed back
  to rdiff-backup
* TODO: stop server before restore and/or notify user
 2015-07-29 10:10:01 +02:00
Jason M. Wood
6aa6238949 README: fix wiki link 2015-07-14 09:04:07 -06:00
Jason M. Wood
fc176c2cc0 README: add a link to the wiki page 2015-07-14 09:02:00 -06:00
Jason M. Wood
8abc406349 Merge pull request #81 from jjchico/migration_cleanup 
Small config migration code clean-up
 2015-07-13 16:31:13 -06:00
Jorge Juan
b2c6c3a527 Small config migration code clean-up 2015-07-13 13:02:15 +02:00
Jason M. Wood
090b4ca912 Update completion and service scripts 2015-07-12 20:59:00 -06:00
Jason M. Wood
16d9f021fa Merge pull request #80 from sandain/properties 
Properties
 2015-07-12 19:53:59 -06:00
Jason M. Wood
650a643afd Merge pull request #78 from jjchico/auto_config_migration 
Auto config migration
 2015-07-12 19:52:28 -06:00
Jason M. Wood
5a2b8a6e78 Merge pull request #79 from sandain/properties 
Merge the properties branch
 2015-07-12 19:51:31 -06:00
Jorge Juan
0d7a3de905 Add automatic migration to new mscs world config 
On startup:

* Check and migrate old-config disabled worlds in worlds-disabled dir to current
  config style.
* Check worlds config and migrate to new per-world config style if necessary.

Notes:

* checkPermission is called first to ensure correct migration so all tasks
  now need root or 'minecraft' user priviledges.
 2015-07-10 19:18:23 +02:00
Jorge Juan
628afadbf6 Fix ls/list help 2015-07-10 11:09:49 +02:00
Jorge Juan
c790ae3c8b Update bash completions rules 
This is to reflect that some operations can now be applied
to any available world even if not enabled.
 2015-07-10 10:25:13 +02:00
Jorge Juan
7dbaa0c1a9 Go back to more robust isWorldEnabled() implementation 2015-07-10 10:02:45 +02:00
Jorge Juan
825f73640b Delete old disabled world code 2015-07-10 09:34:41 +02:00
Jorge Juan
4d4b818239 Adapt detailed listing to new config format 
* Added methods getAvailableWorlds() and isWordlAvailable()
  * Make disabled worlds removable
  * Other minor fixing
 2015-07-10 08:42:10 +02:00
Jorge Juan
5654b514dc Make 'ls' and 'list' list all available worlds by default 
* All available worlds are now listed by default
* The world enable state is included
 2015-07-10 08:41:47 +02:00
Jorge Juan
b96771a0f2 Update bash completion to new listing format 2015-07-10 08:40:28 +02:00
Jorge Juan
936ccb3cba More detailed listing or worlds 
mscs ls: short list. Includes server port
  mscs list: detailed list. Includes some server.properties fields
 2015-07-10 08:39:22 +02:00
Jason M. Wood
c5263bb9b8 Display disabled worlds with the status command 2015-07-09 15:40:45 -06:00
Jason M. Wood
2e58d0223d move mscs options to mscs.properties 2015-07-09 15:39:03 -06:00
Jason M. Wood
80fa28402c Simplify the enable/disable options 2015-07-09 15:35:29 -06:00
Jason M. Wood
b83b1c2432 Merge pull request #74 from jjchico/more_gitignores 
Gitignores for ctags
 2015-07-07 09:16:09 -06:00
Jorge Juan
1be9592220 Gitignores for ctags 2015-07-06 12:28:34 +02:00
Jason M. Wood
e0ee185be9 Merge pull request #73 from jjchico/contrib 
Contrib
 2015-07-04 11:39:52 -06:00
Jorge Juan
c02c7254d3 Fix /etc/default/mscs loading 
/etc/default/mscs was sourced 'after' default variables were used
making overrides not to work. /etc/default/mscs is now sourced twice,
after LOCATION definition and after other variables definition so all
variables can be overrided. A better fix is let for later.
 2015-07-04 18:04:40 +02:00
Jorge Juan
7822c3d014 Fix backup listing 
mscs list-backups did not show last backup. Changed parser to use 'date'
 2015-07-04 18:02:01 +02:00
Jorge Juan
41edd37866 Ignore *~ editor backup files 2015-07-04 15:41:31 +02:00
Jorge Juan
8e7b17635b Add Makefile 'update' option that installs 'mscs' script only 2015-07-04 15:24:33 +02:00
Jorge Juan
e575948370 Change binary install dir to /usr/local/bin 2015-07-04 15:21:58 +02:00
Jason M. Wood
f816b5046f remove white space. noticed by jjchico 2015-07-02 23:11:19 -06:00