diff --git a/cli/release.php b/cli/release.php index b86c1d7aa..acafcc02b 100755 --- a/cli/release.php +++ b/cli/release.php @@ -252,28 +252,27 @@ else if ($options['docker']) { if (isset($options['sign'])) { echo "\x1b[33;1m === PGP Sign === \x1b[0m\n"; - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tar_destination), $return_var); - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($zip_destination), $return_var); + $gpg = 'gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB '; + $gpg_sign = $gpg . '--armor --detach-sign '; + passthru($gpg_sign . escapeshellarg($tar_destination), $return_var); + passthru($gpg_sign . escapeshellarg($zip_destination), $return_var); if (isset($options['nextcloud'])) { - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign ' - .escapeshellarg("{$destPath}snappymail-{$package->version}-nextcloud.tar.gz"), $return_var); + passthru($gpg_sign . escapeshellarg("{$destPath}snappymail-{$package->version}-nextcloud.tar.gz"), $return_var); } if (isset($options['owncloud'])) { - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign ' - .escapeshellarg("{$destPath}snappymail-{$package->version}-owncloud.tar.gz"), $return_var); + passthru($gpg_sign . escapeshellarg("{$destPath}snappymail-{$package->version}-owncloud.tar.gz"), $return_var); } if (isset($options['cpanel'])) { - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign ' - .escapeshellarg("{$destPath}snappymail-{$package->version}-cpanel.tar.gz"), $return_var); + passthru($gpg_sign . escapeshellarg("{$destPath}snappymail-{$package->version}-cpanel.tar.gz"), $return_var); } if (isset($options['debian'])) { - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign ' + passthru($gpg_sign . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var); // https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588 - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output ' + passthru($gpg . '--digest-algo SHA512 --clearsign --output ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var); - passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 -abs --output ' + passthru($gpg . '--digest-algo SHA512 -abs --output ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release.gpg") . ' ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var); }