Fix gnupg storage path

This commit is contained in:
the-djmaze 2022-08-08 12:01:29 +02:00
parent e6a711693b
commit 2330aa2bc9

View file

@ -18,10 +18,10 @@ trait Pgp
return null; return null;
} }
$homedir = $this->StorageProvider()->GenerateFilePath( $homedir = \rtrim($this->StorageProvider()->GenerateFilePath(
$oAccount, $oAccount,
\RainLoop\Providers\Storage\Enumerations\StorageType::ROOT \RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
) . '/.gnupg'; ), '/') . '/.gnupg';
if (!\is_dir($homedir)) { if (!\is_dir($homedir)) {
\mkdir($homedir, 0700, true); \mkdir($homedir, 0700, true);
@ -43,6 +43,8 @@ trait Pgp
$link = $tmpdir . '/' . \md5($homedir); $link = $tmpdir . '/' . \md5($homedir);
if (\is_link($link) || \symlink($homedir, $link)) { if (\is_link($link) || \symlink($homedir, $link)) {
$homedir = $link; $homedir = $link;
} else {
\error_log("symlink('{$homedir}', '{$link}') failed");
} }
} }
// Else try ~/.gnupg/ + hash(email address) // Else try ~/.gnupg/ + hash(email address)