GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix mpv being placed in incorrect bundle location on macOS

Browse source
This commit is contained in:
Damien Elmes 2022-12-03 23:29:26 +10:00
parent c253445c4a
commit 2068c2424d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qt/bundle/mac/src/main.rs
View file

@ -173,11 +173,11 @@ fn fixup_perms(dir: &Utf8Path) -> Result<()> {
} }
/// Copy everything at the provided path into the Contents/ folder of our app. /// Copy everything at the provided path into the Contents/ folder of our app.
fn extend_app_contents(source: &Utf8Path, bundle_dir: &Utf8Path) -> Result<()> { fn extend_app_contents(source: &Utf8Path, target_dir: &Utf8Path) -> Result<()> {
let status = Command::new("rsync") let status = Command::new("rsync")
.arg("-a") .arg("-a")
.arg(format!("{}/", source.as_str())) .arg(format!("{}/", source.as_str()))
.arg(bundle_dir.join("Contents/")) .arg(target_dir)
.status()?; .status()?;
if !status.success() { if !status.success() {
bail!("error syncing {source:?}"); bail!("error syncing {source:?}");
@ -195,12 +195,12 @@ fn copy_in_audio(bundle_dir: &Utf8Path) -> Result<()> {
"out/extracted/mac_amd_audio" "out/extracted/mac_amd_audio"
}, },
); );
extend_app_contents(src_folder, bundle_dir) extend_app_contents(src_folder, &bundle_dir.join("Contents/Resources"))
} }
fn copy_in_qt(bundle_dir: &Utf8Path, kind: DistKind) -> Result<()> { fn copy_in_qt(bundle_dir: &Utf8Path, kind: DistKind) -> Result<()> {
println!("Copying in Qt..."); println!("Copying in Qt...");
extend_app_contents(kind.qt_repo(), bundle_dir) extend_app_contents(kind.qt_repo(), &bundle_dir.join("Contents"))
} }
fn fix_rpath(exe_path: Utf8PathBuf) -> Result<()> { fn fix_rpath(exe_path: Utf8PathBuf) -> Result<()> {