Fix postmarketos-splash version detection during generation of splash screens (#668)

This commit is contained in:
drebrez 2017-10-03 00:39:09 +02:00 committed by Oliver Smith
parent 535dba0964
commit ce2fd6262e
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs
pkgver=0.3.9
pkgver=0.3.10
pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://github.com/postmarketOS"
@ -23,4 +23,4 @@ package() {
}
sha512sums="e1849a13ee696e76dc6c734eda984bcc6a6e2e3d8a62a4df0778a8e338dc0bf9d967fa263ae6e57c14a0cb516c6004c6e251262a1711ad47f1ce4c622727a1d7 init.sh.in
a107e9b49859aa99852a42dc7cbd9815de11c6983c00a2ebd6b9ff53ab6db82aff974d6e715da6aacee3796ae6865a599db5b56a618d90a44c3c4a01fd7bcb01 init_functions.sh
e7768173dddd67a7c06a26ccacbc9e1528c5ae652a504df75128def591235e6383e2f6824147629845cac28c270e6c4d9810fd57c5676c8f2b54ad940b6bd42f mkinitfs.sh"
4253ae9e3cafa04499a22dd8e94cf255208a697f9bcc43b0c10c72c6280b795a6b061e5a273ae37836698a2f0c92e033574c26afe60429145a75407c67b6ad74 mkinitfs.sh"

View File

@ -204,6 +204,10 @@ generate_splash_screens()
[ "$1" != "false" ] && clean="true" || clean="false"
splash_version=$(apk info -v | grep postmarketos-splash)
if [ -z "$splash_version" ]; then
# If package is not installed yet, use latest version from repository
splash_version=$(apk search -x postmarketos-splash)
fi
splash_config="/etc/postmarketos/splash.ini"
splash_config_hash=$(md5sum "$splash_config")
splash_width=${deviceinfo_screen_width:-720}