Archive/screentinker
1
0
Fork 0
mirror of https://github.com/screentinker/screentinker.git synced 2026-08-13 22:03:13 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix(release): bump-version.sh handles env-overridable android version (#168)

Browse source 
Since #168 android versionName/versionCode became env-overridable, the values in
build.gradle.kts live as fallback literals inside `?: "…"` at the end of each line, not
as `versionName = "X"` / `versionCode = N`. The old sed/grep found no versionCode digits,
so $((CODE + 1)) errored under set -e and the whole bump aborted after touching VERSION +
package.json. Retarget the trailing `?: "literal"`.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
ScreenTinker 2026-07-12 23:32:36 -05:00
parent 837f65e634
commit 29ea6f6e99
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/bump-version.sh
View file

@ -58,11 +58,15 @@ printf '%s\n' "$NEW" > VERSION
sed -i -E "s/(\"version\"[[:space:]]*:[[:space:]]*)\"[0-9]+\.[0-9]+\.[0-9]+[^\"]*\"/\1\"$NEW\"/" server/package.json sed -i -E "s/(\"version\"[[:space:]]*:[[:space:]]*)\"[0-9]+\.[0-9]+\.[0-9]+[^\"]*\"/\1\"$NEW\"/" server/package.json
( cd server && npm install --package-lock-only >/dev/null ) ( cd server && npm install --package-lock-only >/dev/null )
# 3) android versionName + versionCode (+1). [0-9][^"]* matches a pre-release current # 3) android versionName + versionCode (+1). Since #168 both are env-overridable, so the
# value too (e.g. 1.9.1-beta1), so beta1->beta2 actually replaces it. # build.gradle.kts values live as FALLBACK literals inside `?: "…"` at the end of each line
sed -i -E "s/(versionName[[:space:]]*=[[:space:]]*)\"[0-9][^\"]*\"/\1\"$NEW\"/" android/app/build.gradle.kts # (versionName = getenv(...) ?: prop ?: "1.9.4"; versionCode = (getenv(...) ?: … ?: "44").toInt()).
CODE="$(grep -oE 'versionCode[[:space:]]*=[[:space:]]*[0-9]+' android/app/build.gradle.kts | grep -oE '[0-9]+$')" # Target that trailing `?: "literal"` (the LAST quoted token on the line) rather than the old
sed -i -E "s/(versionCode[[:space:]]*=[[:space:]]*)[0-9]+/\1$((CODE + 1))/" android/app/build.gradle.kts # `versionName = "X"` / `versionCode = N` forms, which no longer exist. [0-9][^"]* matches a
# pre-release current value too (e.g. 1.9.1-beta1) so beta1->beta2 replaces it.
sed -i -E "s/(versionName.*\?:[[:space:]]*)\"[0-9][^\"]*\"/\1\"$NEW\"/" android/app/build.gradle.kts
CODE="$(grep -E 'versionCode' android/app/build.gradle.kts | grep -oE '\?:[[:space:]]*\"[0-9]+\"' | grep -oE '[0-9]+' | tail -1)"
sed -i -E "s/(versionCode.*\?:[[:space:]]*)\"[0-9]+\"/\1\"$((CODE + 1))\"/" android/app/build.gradle.kts
# 4) tizen widget version. Skip the <?xml ...?> declaration line - its # 4) tizen widget version. Skip the <?xml ...?> declaration line - its
# version="1.0" is the XML FORMAT version, not the app version, and it also # version="1.0" is the XML FORMAT version, not the app version, and it also