diff --git a/screenpipe-app-tauri/scripts/pre_build.js b/screenpipe-app-tauri/scripts/pre_build.js index d41d1c701..8ddd754f6 100644 --- a/screenpipe-app-tauri/scripts/pre_build.js +++ b/screenpipe-app-tauri/scripts/pre_build.js @@ -50,8 +50,8 @@ const config = { ], }, macos: { - ffmpegName: 'ffmpeg-7.1', - ffmpegUrl: 'https://evermeet.cx/ffmpeg/ffmpeg-7.1.7z', + ffmpegName: 'ffmpeg-7.0-macOS-default', + ffmpegUrl: 'https://master.dl.sourceforge.net/project/avbuild/macOS/ffmpeg-7.0-macOS-default.tar.xz?viasf=1', }, } @@ -524,16 +524,16 @@ if (platform == 'macos') { // Setup FFMPEG if (!(await fs.exists(config.ffmpegRealname))) { - await $`wget --no-config -nc ${config.macos.ffmpegUrl} -O ${config.macos.ffmpegName}.7z` - await $`7z e ${config.macos.ffmpegName}.7z -o${config.macos.ffmpegName}` + await $`wget --no-config -nc ${config.macos.ffmpegUrl} -O ${config.macos.ffmpegName}.tar.xz` + await $`tar xf ${config.macos.ffmpegName}.tar.xz` await $`mv ${config.macos.ffmpegName} ${config.ffmpegRealname}` - await $`rm ${config.macos.ffmpegName}.7z` + await $`rm ${config.macos.ffmpegName}.tar.xz` } else { console.log('FFMPEG already exists'); } // Move and rename ffmpeg and ffprobe binaries - const ffmpegSrc = path.join(cwd, config.ffmpegRealname, 'ffmpeg'); + const ffmpegSrc = path.join(cwd, config.ffmpegRealname, 'bin', 'ffmpeg'); // For x86_64 await fs.copyFile(ffmpegSrc, path.join(cwd, 'ffmpeg-x86_64-apple-darwin')); @@ -615,6 +615,7 @@ async function installOllamaSidecar() { if (platform === 'windows' && await fs.exists('C:\\ollama\\')) { console.log('ollama sidecar already exists. skipping installation.'); await fs.cp('C:\\ollama\\', ollamaDir, {recursive: true}); + await fs.rename(path.join(ollamaDir, 'ollama.exe'), path.join(ollamaDir, ollamaExe)); return; }