Browse Source

Merge branch 'master' into development

# Conflicts:
#	lgsm/functions/fix.sh
pull/1003/head
Daniel Gibbs 9 years ago
parent
commit
ebaefb65d8
  1. 4
      lgsm/functions/command_backup.sh
  2. 1
      lgsm/functions/fix.sh

4
lgsm/functions/command_backup.sh

@ -47,7 +47,7 @@ if [ ! -d "${backupdir}" ]; then
mkdir "${backupdir}"
fi
tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./*
if [ $? != 0 ]; then
if [ $? == 0 ]; then
fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size"
fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size"
else
@ -56,4 +56,4 @@ else
fi
sleep 1
echo ""
core_exit.sh
core_exit.sh

1
lgsm/functions/fix.sh

@ -44,7 +44,6 @@ if [ "${function_selfname}" != "command_install.sh" ]; then
elif [ "${gamename}" == "ARMA 3" ]; then
fix_arma3.sh
fi
# fix_glibc.sh is run though check_glibc.sh
fi
# Fixes that are run on install only.

Loading…
Cancel
Save