Răsfoiți Sursa

Merge branch 'master' into development

# Conflicts:
#	lgsm/functions/fix.sh
Daniel Gibbs 9 ani în urmă
părinte
comite
ebaefb65d8
2 a modificat fișierele cu 2 adăugiri și 3 ștergeri
  1. 2 2
      lgsm/functions/command_backup.sh
  2. 0 1
      lgsm/functions/fix.sh

+ 2 - 2
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

+ 0 - 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.