nev/minecraft-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix arg and fix path name construction

Browse source
This commit is contained in:
tleibert 2021-06-02 22:26:31 +00:00
parent 3e68146cf7
commit 681901ec77
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backup.sh
View file

@ -41,7 +41,7 @@ debug-log () {
fi fi
} }
while getopts 'a:cd:e:f:hi:l:m:o:p:qr:s:t:u:vw:x:' FLAG; do while getopts 'a:cd:e:f:hi:l:m:o:p:qr:s:t:u:vw:x' FLAG; do
case $FLAG in case $FLAG in
a) COMPRESSION_ALGORITHM=$OPTARG ;; a) COMPRESSION_ALGORITHM=$OPTARG ;;
c) ENABLE_CHAT_MESSAGES=true ;; c) ENABLE_CHAT_MESSAGES=true ;;
@ -482,9 +482,9 @@ do-backup () {
# set bukkit world paths if this is a bukkit server # set bukkit world paths if this is a bukkit server
if "$BUKKIT"; then if "$BUKKIT"; then
WORLD_PARENT_DIR=$(dirname "$SERVER_WORLD") WORLD_PARENT_DIR=$(dirname "$SERVER_WORLD")
SERVER_WORLD=$(realpath "$SERVER_WORLD")
# overwrite SERVER_WORLD so that restic gets all 3 dirs # overwrite SERVER_WORLD so that restic gets all 3 dirs
SERVER_WORLD="$SERVER_WORLD"\ "$SERVER_WORLD"_nether\ "$SERVER_WORLD"_the_end SERVER_WORLD="$SERVER_WORLD/"\ "$SERVER_WORLD"_nether/\ "$SERVER_WORLD"_the_end/
TAR_ARGS=$(basename -a "$SERVER_WORLD") TAR_ARGS=$(basename -a "$SERVER_WORLD")
else else
# no bukkit--retain previous functionality # no bukkit--retain previous functionality
@ -506,10 +506,10 @@ do-backup () {
case $COMPRESSION_ALGORITHM in case $COMPRESSION_ALGORITHM in
# No compression # No compression
"") tar -cf "$ARCHIVE_PATH" -C "$WORLD_PARENT_DIR" "$TAR_ARGS" "") tar -cf "$ARCHIVE_PATH" -C "$WORLD_PARENT_DIR" $TAR_ARGS
;; ;;
# With compression # With compression
*) tar -cf - -C "$WORLD_PARENT_DIR" "$TAR_ARGS" | $COMPRESSION_ALGORITHM -cv -"$COMPRESSION_LEVEL" - > "$ARCHIVE_PATH" 2>> /dev/null *) tar -cf - -C "$WORLD_PARENT_DIR" $TAR_ARGS | $COMPRESSION_ALGORITHM -cv -"$COMPRESSION_LEVEL" - > "$ARCHIVE_PATH" 2>> /dev/null
;; ;;
esac esac
EXIT_CODES=("${PIPESTATUS[@]}") EXIT_CODES=("${PIPESTATUS[@]}")
@ -531,7 +531,7 @@ do-backup () {
if [[ "$RESTIC_REPO" != "" ]]; then if [[ "$RESTIC_REPO" != "" ]]; then
RESTIC_TIMESTAMP="${TIMESTAMP:0:10} ${TIMESTAMP:11:2}:${TIMESTAMP:14:2}:${TIMESTAMP:17:2}" RESTIC_TIMESTAMP="${TIMESTAMP:0:10} ${TIMESTAMP:11:2}:${TIMESTAMP:14:2}:${TIMESTAMP:17:2}"
restic backup -r "$RESTIC_REPO" "$SERVER_WORLD" --time "$RESTIC_TIMESTAMP" "$QUIET" restic backup -r "$RESTIC_REPO" $SERVER_WORLD --time "$RESTIC_TIMESTAMP" "$QUIET"
ARCHIVE_EXIT_CODE=$? ARCHIVE_EXIT_CODE=$?
if [ "$ARCHIVE_EXIT_CODE" -eq 3 ]; then if [ "$ARCHIVE_EXIT_CODE" -eq 3 ]; then
log-warning "Incomplete snapshot taken (some files could not be read)" log-warning "Incomplete snapshot taken (some files could not be read)"