From 1232d0e13305f462a5a7c29584f50eb232cc4ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Wed, 8 Feb 2023 21:39:10 +0100
Subject: [PATCH] Revert "mbsync: make passwordCommand escaping consistent"
 (#3657)

This reverts commit e2c1756e3ae001ca8696912016dd31cb1503ccf3.
---
 modules/programs/mbsync.nix                        | 2 +-
 tests/modules/programs/mbsync/mbsync-expected.conf | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix
index 8694d2007..d43f64555 100644
--- a/modules/programs/mbsync.nix
+++ b/modules/programs/mbsync.nix
@@ -84,7 +84,7 @@ let
     genSection "IMAPAccount ${name}" ({
       Host = imap.host;
       User = userName;
-      PassCmd = lib.escapeShellArgs passwordCommand;
+      PassCmd = toString passwordCommand;
     } // genTlsConfig imap.tls
       // optionalAttrs (imap.port != null) { Port = toString imap.port; }
       // mbsync.extraConfig.account) + "\n"
diff --git a/tests/modules/programs/mbsync/mbsync-expected.conf b/tests/modules/programs/mbsync/mbsync-expected.conf
index b6c77ea1c..171109782 100644
--- a/tests/modules/programs/mbsync/mbsync-expected.conf
+++ b/tests/modules/programs/mbsync/mbsync-expected.conf
@@ -3,7 +3,7 @@
 IMAPAccount hm-account
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 Host imap.example.org
-PassCmd "'password-command' '2'"
+PassCmd "password-command 2"
 SSLType IMAPS
 User home.manager.jr
 
@@ -55,7 +55,7 @@ Channel hm-account-strangeHostBoxName
 IMAPAccount hm@example.com
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 Host imap.example.com
-PassCmd 'password-command'
+PassCmd password-command
 SSLType IMAPS
 SSLVersions TLSv1.3 TLSv1.2
 User home.manager