fix and update
This commit is contained in:
@@ -27,10 +27,33 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Абсолютный путь надёжнее относительного при Gradle rootProject.file().
|
||||
if grep -q '^storeFile=' "${KEYSTORE_PROPS}"; then
|
||||
sed -i "s|^storeFile=.*|storeFile=${KEYSTORE_FILE}|" "${KEYSTORE_PROPS}"
|
||||
else
|
||||
printf '\nstoreFile=%s\n' "${KEYSTORE_FILE}" >> "${KEYSTORE_PROPS}"
|
||||
fi
|
||||
|
||||
STORE_PASSWORD="$(grep -E '^storePassword=' "${KEYSTORE_PROPS}" | head -n1 | cut -d= -f2- || true)"
|
||||
KEY_ALIAS_PROP="$(grep -E '^keyAlias=' "${KEYSTORE_PROPS}" | head -n1 | cut -d= -f2- || true)"
|
||||
KEY_ALIAS_PROP="${KEY_ALIAS_PROP:-lendry-id}"
|
||||
|
||||
if [[ -z "${STORE_PASSWORD}" ]]; then
|
||||
echo "storePassword не найден в ${KEYSTORE_PROPS}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! keytool -list -keystore "${KEYSTORE_FILE}" -storepass "${STORE_PASSWORD}" -alias "${KEY_ALIAS_PROP}" >/dev/null 2>&1; then
|
||||
echo "Keystore не читается с паролями из ${KEYSTORE_PROPS}." >&2
|
||||
echo "Удалите tauri_app/.secrets и пересоберите APK, либо задайте ANDROID_KEYSTORE_FORCE_REGENERATE=1." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
chmod 600 "${KEYSTORE_PROPS}" || true
|
||||
|
||||
cat > "${SIGNING_SCRIPT}" <<'EOF'
|
||||
import com.android.build.api.dsl.ApplicationExtension
|
||||
import java.io.File
|
||||
import java.util.Properties
|
||||
|
||||
val keystoreProperties = Properties().apply {
|
||||
@@ -40,10 +63,11 @@ val keystoreProperties = Properties().apply {
|
||||
extensions.configure<ApplicationExtension>("android") {
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
val storePasswordValue = keystoreProperties.getProperty("storePassword")
|
||||
keyAlias = keystoreProperties.getProperty("keyAlias")
|
||||
keyPassword = keystoreProperties.getProperty("keyPassword")
|
||||
storeFile = rootProject.file(keystoreProperties.getProperty("storeFile"))
|
||||
storePassword = keystoreProperties.getProperty("storePassword")
|
||||
storeFile = File(keystoreProperties.getProperty("storeFile"))
|
||||
storePassword = storePasswordValue
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
|
||||
Reference in New Issue
Block a user