diff --git a/README.md b/README.md index bd2bf78..06ded7e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # KCauldron ### KCauldron - continuation of Cauldron minecraft server -[![Donate PayPal USD][donate_paypal_usd_img]][donate_paypal_usd_url] [![Donate PayPal RUB][donate_paypal_rub_img]][donate_paypal_rub_url] -[![Donate Yandex Money][donate_yandex_img]][donate_yandex_url] [![Download][download_img]][download_url] +[![Donate PayPal USD][donate_paypal_usd_img]][donate_paypal_usd_url][![Donate PayPal RUB][donate_paypal_rub_img]][donate_paypal_rub_url] +[![Donate Yandex Money][donate_yandex_img]][donate_yandex_url]![Download][download_img] ## Building KCauldron * Checkout project @@ -44,5 +44,4 @@ If you're once checkout source - you not need to do it again [donate_paypal_rub_img]: https://prok.pw/donate_paypal_rub.png [donate_yandex_url]: https://prok.pw/donate/donate_yandex.htm [donate_yandex_img]: https://prok.pw/donate_yandex.png -[download_url]: https://prok.pw/repo/pw/prok/KCauldron/ [download_img]: https://prok.pw/download.png diff --git a/build.gradle b/build.gradle index ed72fba..04e3bed 100644 --- a/build.gradle +++ b/build.gradle @@ -48,13 +48,13 @@ minecraft { group = 'pw.prok' def retrieveBuildNumber() { - if (!project.hasProperty('officialBuild')) return 'UNOFFICIAL' + if (!project.hasProperty('officialBuild')) return 'UNOFFICIAL.' + retrieveGitHash(false) new JsonSlurper().parse(new URL("https://prok.pw/version/${group}/${name}"))['nextBuildNumber'] } -def retrieveGitHash() { +def retrieveGitHash(full = true) { if (file('.git').exists()) - return ['git', 'log', '--format=%H', '-n', '1'].execute().text.trim() + return ['git', 'log', "--format=%${full?'H':'h'}", '-n', '1'].execute().text.trim() return 'NOTGIT' }