rename is_flathub
This commit is contained in:
+1
-1
@@ -28,7 +28,7 @@ import {
|
|||||||
export async function initRclone(args: string[]) {
|
export async function initRclone(args: string[]) {
|
||||||
console.log('[initRclone] starting with args:', args)
|
console.log('[initRclone] starting with args:', args)
|
||||||
|
|
||||||
const system = !(await invoke<boolean>('is_flathub')) && (await isSystemRcloneInstalled())
|
const system = !(await invoke<boolean>('is_flatpak')) && (await isSystemRcloneInstalled())
|
||||||
console.log('[initRclone] system rclone installed:', system)
|
console.log('[initRclone] system rclone installed:', system)
|
||||||
let internal = await isInternalRcloneInstalled()
|
let internal = await isInternalRcloneInstalled()
|
||||||
console.log('[initRclone] internal rclone installed:', internal)
|
console.log('[initRclone] internal rclone installed:', internal)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ fn show_toolbar(app_handle: AppHandle) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn is_flathub() -> bool {
|
fn is_flatpak() -> bool {
|
||||||
std::path::Path::new("/.flatpak-info").exists() || std::env::var_os("FLATPAK_ID").is_some()
|
std::path::Path::new("/.flatpak-info").exists() || std::env::var_os("FLATPAK_ID").is_some()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -787,7 +787,7 @@ pub fn run() {
|
|||||||
|
|
||||||
let mut builder = tauri::Builder::default();
|
let mut builder = tauri::Builder::default();
|
||||||
|
|
||||||
if !is_flathub() {
|
if !is_flatpak() {
|
||||||
builder = builder
|
builder = builder
|
||||||
.plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
|
.plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
|
||||||
let _ = shortcut::show_toolbar_window(app);
|
let _ = shortcut::show_toolbar_window(app);
|
||||||
@@ -827,7 +827,7 @@ pub fn run() {
|
|||||||
show_toolbar,
|
show_toolbar,
|
||||||
update_system_rclone,
|
update_system_rclone,
|
||||||
test_proxy_connection,
|
test_proxy_connection,
|
||||||
is_flathub,
|
is_flatpak,
|
||||||
open_full_window,
|
open_full_window,
|
||||||
open_window,
|
open_window,
|
||||||
open_small_window,
|
open_small_window,
|
||||||
@@ -842,7 +842,7 @@ pub fn run() {
|
|||||||
{
|
{
|
||||||
// Flatpak/Flathub sandbox typically cannot write to system desktop/mime locations.
|
// Flatpak/Flathub sandbox typically cannot write to system desktop/mime locations.
|
||||||
// Deep-link registration is best-effort; never fail app startup.
|
// Deep-link registration is best-effort; never fail app startup.
|
||||||
if is_flathub() {
|
if is_flatpak() {
|
||||||
log::info!("skipping deep-link registration in Flatpak/Flathub");
|
log::info!("skipping deep-link registration in Flatpak/Flathub");
|
||||||
} else {
|
} else {
|
||||||
use tauri_plugin_deep_link::DeepLinkExt;
|
use tauri_plugin_deep_link::DeepLinkExt;
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export default function GeneralSection() {
|
|||||||
const flathubQuery = useQuery({
|
const flathubQuery = useQuery({
|
||||||
queryKey: ['flathub'],
|
queryKey: ['flathub'],
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
const flathub = await invoke<boolean>('is_flathub')
|
const flathub = await invoke<boolean>('is_flatpak')
|
||||||
return flathub
|
return flathub
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user