From cfa66c0489c4a6914f9c062107bc3366465423b6 Mon Sep 17 00:00:00 2001 From: lethosor Date: Mon, 1 Feb 2016 11:38:28 -0500 Subject: [PATCH] Fix whitespace --- scripts/devel/check-release.lua | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/devel/check-release.lua b/scripts/devel/check-release.lua index 23f424a28..fcc50642e 100644 --- a/scripts/devel/check-release.lua +++ b/scripts/devel/check-release.lua @@ -7,21 +7,21 @@ Basic checks for release readiness ok = true function err(s) - dfhack.printerr(s) - ok = false + dfhack.printerr(s) + ok = false end function warn(s) - dfhack.color(COLOR_YELLOW) - dfhack.print(s .. '\n') - dfhack.color(nil) + dfhack.color(COLOR_YELLOW) + dfhack.print(s .. '\n') + dfhack.color(nil) end dfhack_ver = dfhack.getDFHackVersion() git_desc = dfhack.getGitDescription() git_commit = dfhack.getGitCommit() if not dfhack.isRelease() then - err('This build is not tagged as a release') - print[[ + err('This build is not tagged as a release') + print[[ This is probably due to missing git tags. Try running `git fetch origin --tags` in the DFHack source tree. ]] @@ -29,31 +29,31 @@ end expected_git_desc = ('%s-0-g%s'):format(dfhack_ver, git_commit:sub(1, 7)) if git_desc:sub(1, #expected_git_desc) ~= expected_git_desc then - err(([[Bad git description: + err(([[Bad git description: Expected %s, got %s]]):format(expected_git_desc, git_desc)) - print[[ + print[[ Ensure that the DFHack source tree is up-to-date (`git pull`) and CMake is installing DFHack to this DF folder. ]] end if not dfhack.gitXmlMatch() then - err('library/xml submodule commit does not match tracked commit\n' .. - ('Expected %s, got %s'):format( - dfhack.getGitXmlCommit():sub(1, 7), - dfhack.getGitXmlExpectedCommit():sub(1, 7) - )) - print('Try running `git submodule update` in the DFHack source tree.') + err('library/xml submodule commit does not match tracked commit\n' .. + ('Expected %s, got %s'):format( + dfhack.getGitXmlCommit():sub(1, 7), + dfhack.getGitXmlExpectedCommit():sub(1, 7) + )) + print('Try running `git submodule update` in the DFHack source tree.') end if dfhack.isPrerelease() then - warn('This build is marked as a prerelease.') - print('If this is not intentional, be sure your DFHack tree is up-to-date\n' .. - '(`git pull`) and try again.') + warn('This build is marked as a prerelease.') + print('If this is not intentional, be sure your DFHack tree is up-to-date\n' .. + '(`git pull`) and try again.') end if not ok then - err('This build is not release-ready!') + err('This build is not release-ready!') else - print('Release checks succeeded') + print('Release checks succeeded') end