diff --git a/release.sh b/release.sh index e9f6c2696169..dc67022e6029 100644 --- a/release.sh +++ b/release.sh @@ -11,7 +11,7 @@ ver_legendary=`echo "$legendary" | tail -1` cd "$tmp_steam" git commit -am "$ver_steam" -git tag "$ver_steam-1-steam" +git tag "$ver_steam-steam" git remote add downstream ssh://aur@aur.archlinux.org/bakkesmod-steam.git echo "" @@ -23,7 +23,7 @@ echo "" cd "$tmp_legendary" git commit -am "$ver_legendary" -git tag "$ver_legendary-1-legendary" +git tag "$ver_legendary-legendary" git remote add downstream ssh://aur@aur.archlinux.org/bakkesmod-legendary.git echo "" diff --git a/update.sh b/update.sh index acfd4296ec5d..fe2d46113651 100644 --- a/update.sh +++ b/update.sh @@ -11,8 +11,9 @@ curl -LO "$dll" curl -LO "$src" git clone "$loopback" -rlver=`echo "$rlstr" | sed "s%\.% %g"` -pkgver=`echo "$rlstr" | sed "s%\..*\.%.%g"` +rlver=($(echo "$rlstr" | sed "s%\.% %g")) +pkgver="${rlver[0]}.${rlver[2]}" +pkgrel="${rlver[3]:-1}" dll_sum=`sha256sum BakkesMod.zip | sed "s% *[^ ]*$%%"` src_sum=`sha256sum "$rlstr.zip" | sed "s% *[^ ]*$%%"` @@ -31,9 +32,9 @@ done sed -i "${dll_idx}s/\( *\)'[^']*'/\1'$dll_sum'/" PKGBUILD sed -i "${src_idx}s/\( *\)'[^']*'/\1'$src_sum'/" PKGBUILD -sed -i "s/rlver=( .* )/rlver=( $rlver )/" PKGBUILD -sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD +sed -i "s/rlver=( .* )/rlver=( ${rlver[*]} )/" PKGBUILD +sed -i "s/pkgrel=.*/pkgrel=$pkgrel/" PKGBUILD makepkg --printsrcinfo > .SRCINFO pwd -echo "$pkgver" +echo "$pkgver-$pkgrel"