Removed extraneous .service postfixes and improved messages.
This commit is contained in:
@@ -137,9 +137,9 @@ if [[ ! -f "${MARKER}" ]]; then
|
|||||||
FIRST_TIME=1
|
FIRST_TIME=1
|
||||||
fi
|
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.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
|
if [[ "${FIRST_TIME}" == "1" ]]; then
|
||||||
echo "First-time setup: initializing pass keychain for ${BRIDGE_USER} (required by Proton Mail Bridge on Linux)."
|
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}" \
|
runuser -u "${BRIDGE_USER}" -- env HOME="${BRIDGE_HOME}" GNUPGHOME="${GNUPG_HOME}" \
|
||||||
pass init "${FPR}"
|
pass init "${FPR}"
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Starting Proton Mail Bridge CLI."
|
echo "To do initial configuration of the Proton Mail Bridge:"
|
||||||
echo "Run: login"
|
echo "Run: login"
|
||||||
echo "Run: info"
|
echo "Run: info"
|
||||||
echo "Run: exit"
|
echo "Run: exit"
|
||||||
echo
|
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}" \
|
runuser -u "${BRIDGE_USER}" -- env HOME="${BRIDGE_HOME}" \
|
||||||
protonmail-bridge -c
|
protonmail-bridge -c
|
||||||
|
|||||||
Reference in New Issue
Block a user