fix(core): fallback to WRY_ANDROID_PACKAGE with backticks replaced (#11348)

amrbashir · web-flow · commit f3f521f038fa · 2024-10-14T13:15:15.000-03:00
ref: #11332
diff --git a/.changes/android-unescaped.md b/.changes/android-unescaped.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Fix `TAURI_ANDROID_PACKAGE_UNESCAPED not set` panic during compilation for Android when using an older tauri cli.
diff --git a/crates/tauri/build.rs b/crates/tauri/build.rs
@@ -299,7 +299,8 @@ fn main() {
     }
 
     if let Some(project_dir) = env::var_os("TAURI_ANDROID_PROJECT_PATH").map(PathBuf::from) {
-      let package_unescaped = env_var("TAURI_ANDROID_PACKAGE_UNESCAPED");
+      let package_unescaped = env::var("TAURI_ANDROID_PACKAGE_UNESCAPED")
+        .unwrap_or_else(|_| env_var("WRY_ANDROID_PACKAGE").replace('`', ""));
       let tauri_proguard =
         include_str!("./mobile/proguard-tauri.pro").replace("$PACKAGE", &package_unescaped);
       std::fs::write(

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tauri": "patch:bug"
 +---
++
 +Fix `TAURI_ANDROID_PACKAGE_UNESCAPED not set` panic during compilation for Android when using an older tauri cli.
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,8 @@ fn main() {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`if let Some(project_dir) = env::var_os("TAURI_ANDROID_PROJECT_PATH").map(PathBuf::from) {`
`302`		`- let package_unescaped = env_var("TAURI_ANDROID_PACKAGE_UNESCAPED");`
	`302`	`+ let package_unescaped = env::var("TAURI_ANDROID_PACKAGE_UNESCAPED")`
	`303`	+ .unwrap_or_else(\|_\| env_var("WRY_ANDROID_PACKAGE").replace('`', ""));
`303`	`304`	`let tauri_proguard =`
`304`	`305`	`include_str!("./mobile/proguard-tauri.pro").replace("$PACKAGE", &package_unescaped);`
`305`	`306`	`std::fs::write(`