mcwrapper 1.6.6 → 1.6.7pre

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mcwrapper (1.6.2)
+    mcwrapper (1.6.7pre)
 
 GEM
   remote: https://rubygems.org/

data/lib/mcwrapper/version.rb

@@ -1,4 +1,4 @@
 module MCWrapper
  # VERSION = `#{ MCWRAPPER } --version`.split(/\s/).last
-  VERSION = '1.6.6'
+  VERSION = '1.6.7pre'
 end

data/libexec/mcwrapper

@@ -6,7 +6,7 @@
 #  https://github.com/spikegrobstein/mcwrapper
 ##
 
-MCWRAPPER_VERSION="1.6.6"
+MCWRAPPER_VERSION="1.6.7pre"
 
 #### Exit Codes
 
@@ -452,31 +452,45 @@ function remove_pipe {
 
 # write the PID file and start'er up!
 # don't start if we're already running.
+# if FOREGROUND is defined, then start in foreground
+# otherwise, ensure that pipe is created and start in background
 function start_minecraft {
   if check_is_running; then
     echo "Server is already running. Exiting..." >&2
     exit $EXIT_SERVER_ALREADY_RUNNING
   fi
 
-  set_up_pipe
-
   # now we go to the minecraft_server directory and start the server in a background process
   # need to go to the directory to make sure that the Minecraft server puts the files in the right place (it puts them in the CWD)
   pushd $MINECRAFT_SERVER_DIR_PATH &> /dev/null
-  read_command | $MINECRAFT_SERVER_CMD &> /dev/null &
 
-  create_pid $!
+  if [[ -z "$FOREGROUND" ]]; then
+    set_up_pipe
+    start_minecraft_in_background
 
-  # sleep for one second to make sure that the process actually started properly.
-  sleep 1
+    create_pid $!
 
-  # verify that minecraft server actually started.
-  if ! check_is_running; then
-    echo "Could not start Minecraft Server." >&2
-    exit $EXIT_SERVER_CANNOT_START
+    # sleep for one second to make sure that the process actually started properly.
+    sleep 1
+
+    # verify that minecraft server actually started.
+    if ! check_is_running; then
+      echo "Could not start Minecraft Server." >&2
+      exit $EXIT_SERVER_CANNOT_START
+    fi
+  else
+    start_minecraft_in_foreground
   fi
 }
 
+function start_minecraft_in_background {
+  read_command | $MINECRAFT_SERVER_CMD &> /dev/null &
+}
+
+function start_minecraft_in_foreground {
+  $MINECRAFT_SERVER_CMD
+}
+
 # stops the minecraft server by sending it the 'stop' command via the FIFO
 function stop_minecraft {
   # if $BACKUP_ON_EXIT is non-zero length, then backup the world before exiting.
@@ -1077,11 +1091,18 @@ case $ACTION in
     ;;
   start )
     sanity_check
-    echo -n "Starting minecraft... "  
+    echo -n "Starting minecraft... "
     start_minecraft
     echo "Done."
     exit $EXIT_SUCCESS
     ;;
+  start-foreground )
+    sanity_check
+    echo "Starting minecraft in the foreground..."
+    FOREGROUND=1
+    start_minecraft
+    exit $?
+    ;;
   stop )
     sanity_check
     echo -n "Stopping minecraft... "

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mcwrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.6
-  prerelease: 
+  version: 1.6.7pre
+  prerelease: 5
 platform: ruby
 authors:
 - Spike Grobstein
@@ -46,9 +46,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24