mcwrapper 1.6.2 → 1.6.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mcwrapper (1.6.0)
+    mcwrapper (1.6.2)
 
 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.2'
+  VERSION = '1.6.3'
 end

data/libexec/mcwrapper

@@ -6,7 +6,7 @@
 #  https://github.com/spikegrobstein/mcwrapper
 ##
 
-MCWRAPPER_VERSION="1.6.2"
+MCWRAPPER_VERSION="1.6.3"
 
 #### Exit Codes
 
@@ -775,7 +775,19 @@ function world_dir_path () {
 function do_backup () {
   local WORLD_DATA_DIR=$(world_dir_path)
 
-  cp -R "$WORLD_DATA_DIR" "$CURRENT_BACKUP_PATH/"
+  if [[ ! -e "$WORLD_DATA_DIR" ]]; then
+    # check $DOING_RESTORE global variable (set inside restore_world function)
+    if [[ ! -z "$DOING_RESTORE" ]]; then
+      echo "Skipping backup because world data directory does not exist." >&2
+      return 1
+    else
+      echo "World data directory does not exist. Cannot backup." >&2
+      exit $EXIT_CANNOT_BACKUP_WORLD_DATA
+    fi
+  fi
+
+  # copy the current world directory into 'world' directory in current backup
+  cp -R "$WORLD_DATA_DIR" "$CURRENT_BACKUP_PATH/world"
 
   if [[ $? != 0 ]]; then
     #an error occurred
@@ -902,7 +914,15 @@ function backup_world {
     # set BACKUPS_TO_KEEP to "0" to disable backups entirely.
     echo ""
     echo "Backups are disabled. Not backing anything up."
-    exit $EXIT_BACKUPS_DISABLED
+
+    # if we're doing a restore, then just return a non-zero,
+    # otherwise exit with an exit code.
+    if [[ -z "$DOING_RESTORE" ]]; then
+      # not doing backup
+      exit $EXIT_BACKUPS_DISABLED
+    else
+      return 1
+    fi
   fi
 
   # the path to the to-be-backed-up directory
@@ -954,15 +974,18 @@ function path_to_latest_backup {
 # given a path to a world backup, restore the current world with the contents
 # when doing this, back up the current world, if it exists
 function restore_world {
+  DOING_RESTORE=1
   local RESTORE_FROM=$1
+  local RESTORE_FROM_WORLD="${RESTORE_FROM}/world"
 
   # check to make sure a RESTORE_FROM parameter is supplied
+  # TODO: fix the output of this usage to show how mcwrapper was called
   [[ -z "$RESTORE_FROM" ]] \
     && { echo "USAGE: $0 restore <backup_name>" >&2; exit $EXIT_CANNOT_RESTORE_WORLD; }
 
   # check to make sure world dir exists and is a dir
-  [[ -e "$RESTORE_FROM" && -d "$RESTORE_FROM" ]] \
-    || { echo "Path does not appear to be a Minecraft world directory or does not exist." >&2; exit $EXIT_CANNOT_RESTORE_WORLD; }
+  [[ -e "$RESTORE_FROM" && -d "$RESTORE_FROM" && -d "${RESTORE_FROM}/world" ]] \
+    || { echo "Path does not appear to be a Minecraft world backup directory or does not exist." >&2; exit $EXIT_CANNOT_RESTORE_WORLD; }
 
   # back-up current world data and temporarily enable infinite retention
   # we don't want to inadvertently clobber any existing backups
@@ -974,7 +997,7 @@ function restore_world {
 
   if check_is_running; then
     SERVER_IS_RUNNING="1"
-    stop_server
+    stop_minecraft
   else
     SERVER_IS_RUNNING="0"
   fi
@@ -983,13 +1006,16 @@ function restore_world {
   rm -rf "$WORLD_DIR_PATH"
 
   # copy world
-  cp -R "$RESTORE_FROM" "$WORLD_DIR_PATH"
-  echo "$RESTORE_FROM" > "$WORLD_DIR_PATH/RESTORED_FROM"
+  cp -R "$RESTORE_FROM_WORLD" "$WORLD_DIR_PATH" \
+    || { echo "Error restoring world file." >&2 ; exit $EXIT_CANNOT_RESTORE_WORLD; }
+  echo "$RESTORE_FROM_WORLD" > "$WORLD_DIR_PATH/RESTORED_FROM"
 
   # start server if it was running when we started
   if [[ "$SERVER_IS_RUNNING" = '1' ]]; then
     start_minecraft
   fi
+
+  unset DOING_RESTORE
 }
 
 ## End MCBackup portion.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcwrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Control your Minecraft server. start/stop and live backups.
 email: