From 5b496a28d24cf1f33f8ef3b7ef665d901a121c95 Mon Sep 17 00:00:00 2001
From: Stephen Chin <steveonjava@gmail.com>
Date: Sun, 8 Mar 2026 23:08:32 -0700
Subject: [PATCH] Removed extraneous .service postfixes and improved messages.

---
 install/protonmail-bridge-install.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/install/protonmail-bridge-install.sh b/install/protonmail-bridge-install.sh
index 1a1bc765..0860d08e 100644
--- a/install/protonmail-bridge-install.sh
+++ b/install/protonmail-bridge-install.sh
@@ -137,9 +137,9 @@ if [[ ! -f "${MARKER}" ]]; then
   FIRST_TIME=1
 fi
 
-# Stop sockets/proxies/bridge daemon if they were manually started
+# Stop sockets/proxies/bridge daemon before configuration
 systemctl stop protonmail-bridge-imap.socket protonmail-bridge-smtp.socket 2>/dev/null || true
-systemctl stop protonmail-bridge-imap-proxy.service protonmail-bridge-smtp-proxy.service protonmail-bridge.service 2>/dev/null || true
+systemctl stop protonmail-bridge-imap-proxy protonmail-bridge-smtp-proxy protonmail-bridge 2>/dev/null || true
 
 if [[ "${FIRST_TIME}" == "1" ]]; then
   echo "First-time setup: initializing pass keychain for ${BRIDGE_USER} (required by Proton Mail Bridge on Linux)."
@@ -165,14 +165,20 @@ if [[ "${FIRST_TIME}" == "1" ]]; then
 
   runuser -u "${BRIDGE_USER}" -- env HOME="${BRIDGE_HOME}" GNUPGHOME="${GNUPG_HOME}" \
     pass init "${FPR}"
-fi
 
-echo
-echo "Starting Proton Mail Bridge CLI."
-echo "Run: login"
-echo "Run: info"
-echo "Run: exit"
-echo
+  echo
+  echo "To do initial configuration of the Proton Mail Bridge:"
+  echo "Run: login"
+  echo "Run: info"
+  echo "Run: exit"
+  echo
+else
+  echo
+  echo "Launching Proton Mail Bridge CLI for configuration."
+  echo "External access is disabled until you exit."
+  echo "Run: exit"
+  echo
+fi
 
 runuser -u "${BRIDGE_USER}" -- env HOME="${BRIDGE_HOME}" \
   protonmail-bridge -c