From e0de67cf9a409672b2260502b77d22ea9f35322a Mon Sep 17 00:00:00 2001 From: Andreas Rosland Date: Mon, 31 Jul 2023 11:47:54 -0500 Subject: [PATCH] if mbsync -v is less than 1.4.0 use old format, else use new format --- bin/mw | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/mw b/bin/mw index 81c75d9..2083228 100755 --- a/bin/mw +++ b/bin/mw @@ -29,14 +29,14 @@ maxmes="0" alias mbsync='mbsync -c "$mbsyncrc"' -# mbsync now requires "Far/Near" rather than "Master/Slave", but Ubuntu/Debian -# have the older version. -if command -V apt-get >/dev/null 2>&1; then - master="Master" - slave="Slave" -else - master="Far" - slave="Near" +# mbsync >= 1.4.0 requires "Far/Near" rather than "Master/Slave" +master="Far" +slave="Near" +mbsync_version=$(mbsync --version | cut -d' ' -f2) +#check if version is less than 1.4.0 +if [[ "$(printf '1.4.0\n%s' "$mbsync_version" | sort -V | head -n1)" != "1.4.0" ]]; then + master="Master" + slave="Slave" fi for x in "/etc/ssl/certs/ca-certificates.crt" \