Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

Fix the macOS build, formatting and a shellcheck note from the installer change

Beebfce4ed45e0c
diff --git a/desktop/app/src/updater.rs b/desktop/app/src/updater.rs
index 3475fd6..f7919a9 100644
--- a/desktop/app/src/updater.rs
+++ b/desktop/app/src/updater.rs
@@ -242,7 +242,8 @@ const TARBALL_SUFFIXES: &[&str] = if cfg!(target_arch = "aarch64") {
// An RPM install only takes an RPM: a tarball would land in /opt as a
// second copy beside the package.
#[cfg(target_os = "linux")]
-const RPM_SUFFIXES: &[&str] = if cfg!(target_arch = "aarch64") { &[".aarch64.rpm"] } else { &[".x86_64.rpm"] };
+const RPM_SUFFIXES: &[&str] =
+ if cfg!(target_arch = "aarch64") { &[".aarch64.rpm"] } else { &[".x86_64.rpm"] };
#[cfg(target_os = "linux")]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -907,7 +908,7 @@ apt-get install -y -- \"$dst\" || dpkg -i -- \"$dst\"\n";
/// Installs the RPM in `$1` with whichever package manager the system has.
/// Its SHA-256 is checked before this runs; release RPMs aren't GPG-signed.
-#[cfg(target_os = "linux")]
+#[cfg(not(windows))]
const RPM_INSTALL_COMMAND: &str = "\
if command -v dnf >/dev/null 2>&1; then dnf install -y --nogpgcheck -- \"$1\"; \
elif command -v zypper >/dev/null 2>&1; then zypper --non-interactive --no-gpg-checks install -- \"$1\"; \
diff --git a/desktop/packaging/linux/install.sh b/desktop/packaging/linux/install.sh
index 4ffd09e..12efe10 100755
--- a/desktop/packaging/linux/install.sh
+++ b/desktop/packaging/linux/install.sh
@@ -448,7 +448,7 @@ remember_firewall() {
if [ "$(id -u)" -eq 0 ] && [ "$TARGET_USER" != "root" ]; then
su -s /bin/sh "$TARGET_USER" -c "mkdir -p '$dir' && printf '$DATA_PORT\n' > '$dir/firewall_verified'" 2>/dev/null || true
elif [ "$(id -u)" -ne 0 ]; then
- mkdir -p "$dir" && printf '%s\n' "$DATA_PORT" > "$dir/firewall_verified" || true
+ if mkdir -p "$dir"; then printf '%s\n' "$DATA_PORT" > "$dir/firewall_verified" || true; fi
fi
}