Commit Graph

536 Commits

Author SHA1 Message Date
Jason M. Wood
9a2d6af2f6 Makefile: drop duplicate rm -f statement 2015-11-16 14:47:49 -07:00
Jason M. Wood
4c5694911f README: add the msctl script to the manual install 2015-11-04 10:57:55 -07:00
Jason M. Wood
b4ebfcba08 README: fix another discrepency in file locations 2015-11-04 10:54:42 -07:00
Jason M. Wood
6cf7c96d3a README: update the installation notes
The locations to manually install the script were wrong, use the same locations found in the Makefile.
2015-11-04 10:48:14 -07:00
Jason M. Wood
72e222c4a4 mscs: don't try to load the defaults file if it is missing 2015-09-19 13:03:53 -06:00
Jason M. Wood
93dbb42ce3 Modify {get|set}Value to work with Windows formatted files 2015-08-27 18:02:13 -06:00
Jason M. Wood
cd532d146c Make sure the EULA value is lower case 2015-08-27 17:45:27 -06:00
Jason M. Wood
4ffdbe9562 Fix typo in comments 2015-08-21 15:24:54 -06:00
Jason M. Wood
0c287d3542 Don't use sudo with minecraft user. 2015-08-21 14:51:34 -06:00
Jason M. Wood
7b548d857f Merge pull request #94 from jjchico/unpriv-user
Better privilege handling
2015-08-21 14:49:22 -06:00
Jason M. Wood
4f319f1ea5 Merge pull request #96 from jjchico/systemd-fix
Bug fix for issue #95
2015-08-18 11:02:41 -06:00
Jorge Juan
0d533aad78 Install systemd service in /etc not /lib 2015-08-16 18:17:51 +02:00
Jorge Juan
4579fce37a Make mscs.service point the right mscs 2015-08-16 18:17:21 +02:00
Jorge Juan
cd2c9cbfc1 Add missing newline in printf 2015-08-12 11:16:40 +02:00
Jorge Juan
e8df9daf43 Update usage command line format 2015-08-12 01:47:13 +02:00
Jorge Juan
b121b4b573 Makefile: install services only if systemctl available 2015-08-11 19:04:25 +02:00
Jorge Juan
144b9fcacf Add msctl to Makefile 2015-08-11 18:46:21 +02:00
Jorge Juan
4b102d40e8 Add '-l' option usage info 2015-08-11 18:41:15 +02:00
Jorge Juan
ed5531a454 Solve problem with mscs wrapper default location
mscs now uses the traditional defaul mscs location.
2015-08-11 18:29:27 +02:00
Jorge Juan
e1dc46c6be Added location command line option (-l)
Also added basic command-line option parsing and modify defaults
overrides accordingly.
2015-08-11 18:28:03 +02:00
Jorge Juan
9ed3d0cc89 Create default world on bare 'create' 2015-08-11 15:43:53 +02:00
Jorge Juan
1ffb66e326 Do not create a default world on 'start' 2015-08-11 15:14:14 +02:00
Jorge Juan
b312d93294 Extract executable name from basename 2015-08-11 14:55:59 +02:00
Jorge Juan
b06df11198 bash completions support for msctl 2015-08-11 14:27:59 +02:00
Jorge Juan
e104e57ad8 Added mscs wrapper
mscs is now a wrapper to msctl. Any user with 'sudo' privileges
can now execute mscs and execute actions as the minecraft user.
2015-08-10 14:59:57 +02:00
Jorge Juan
29c76f9b56 Removed system init comments from msctl 2015-08-10 14:59:07 +02:00
Jorge Juan
584869b57f Add per-user configuration support
msctl is now user-agnostic: any user can run the script in his
own account.

Default location is $HOME/mscs.

Default options can be overrided in config files $HOME/mscs.conf and
$HOME/.config/mscs/mscs.conf (first available file is used).

Command line config file override option (-c) is introduced, mainly
to support system-wide installation.

TODO: mscs wrapper to support system-wide installation and retain
backwards compatibility.
2015-08-10 14:28:28 +02:00
Jorge Juan
6da60dc209 Remove checkPermissions 2015-08-10 13:17:50 +02:00
Jorge Juan
9bbadadf3b Remove 'execute' method 2015-08-10 13:09:38 +02:00
Jorge Juan
ffe2bfd96f Move mscs to msctl 2015-08-10 13:07:40 +02:00
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