Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/deps_deploy/gpg.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(or (System/getenv "DEPS_DEPLOY_GPG") "gpg"))

(defn read-passphrase []
(let [console (System/console)]
(when-let [console (System/console)]
(String. (.readPassword console "%s" (into-array ["gpg passphrase: "])))))

(defn gpg [{:keys [passphrase args]}]
Expand Down Expand Up @@ -36,9 +36,11 @@
(update cmd :args into ["--yes" "--armour" "--detach-sign" file]))

(defn add-passphrase [cmd passphrase]
(-> cmd
(update :args #(into ["--batch" "--pinentry-mode" "loopback" "--passphrase-fd" "0"] %))
(assoc :passphrase passphrase)))
(if passphrase
(-> cmd
(update :args #(into ["--batch" "--pinentry-mode" "loopback" "--passphrase-fd" "0"] %))
(assoc :passphrase passphrase))
(update cmd :args #(into ["--batch"] %))))

(defn add-key [cmd key]
(update cmd :args #(into ["--default-key" key] %)))
Expand Down