Merge 102251abb2 into 57c519436e
This commit is contained in:
commit
63c01249f1
3 changed files with 38 additions and 8 deletions
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
set -ex
|
||||
|
||||
# Workaround for stale gpg-agent socket causing auth failures on restart
|
||||
# Cleans up leftover sockets in the GPG home directory
|
||||
if [ -d /root/.gnupg ]; then
|
||||
rm -f /root/.gnupg/S.gpg-agent*
|
||||
fi
|
||||
|
||||
# Initialize
|
||||
if [[ $1 == init ]]; then
|
||||
|
||||
|
|
@ -37,13 +43,22 @@ else
|
|||
# socat will make the conn appear to come from 127.0.0.1
|
||||
# ProtonMail Bridge currently expects that.
|
||||
# It also allows us to bind to the real ports :)
|
||||
socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
|
||||
socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
|
||||
socat TCP-LISTEN:25,fork,reuseaddr TCP:127.0.0.1:1025,nodelay &
|
||||
socat TCP-LISTEN:143,fork,reuseaddr TCP:127.0.0.1:1143,nodelay &
|
||||
|
||||
# Start protonmail
|
||||
# Fake a terminal, so it does not quit because of EOF...
|
||||
rm -f faketty
|
||||
mkfifo faketty
|
||||
cat faketty | protonmail-bridge --cli
|
||||
|
||||
# Keep faketty open
|
||||
sleep infinity > faketty &
|
||||
|
||||
# Start bridge reading from faketty
|
||||
protonmail-bridge --cli < faketty &
|
||||
|
||||
# Wait for the bridge to exit
|
||||
wait $!
|
||||
exit $?
|
||||
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue