Browse Source

Use agent

Bob Mottram 7 years ago
parent
commit
3dec7889b0
1 changed files with 12 additions and 0 deletions
  1. 12
    0
      src/freedombone-utils-gpg

+ 12
- 0
src/freedombone-utils-gpg View File

228
             echo 'GPG_TTY=$(tty)' >> /root/.bashrc
228
             echo 'GPG_TTY=$(tty)' >> /root/.bashrc
229
             echo 'export GPG_TTY' >> /root/.bashrc
229
             echo 'export GPG_TTY' >> /root/.bashrc
230
         fi
230
         fi
231
+        if grep -q '# use-agent' /root/.gnupg/gpg.conf; then
232
+            sed -i 's|# use-agent|use-agent|g' /root/.gnupg/gpg.conf
233
+        fi
231
         if ! grep -q 'use-agent' /root/.gnupg/gpg.conf; then
234
         if ! grep -q 'use-agent' /root/.gnupg/gpg.conf; then
232
             echo 'use-agent' >> /root/.gnupg/gpg.conf
235
             echo 'use-agent' >> /root/.gnupg/gpg.conf
233
         fi
236
         fi
240
         if ! grep -q 'allow-loopback-pinentry' /root/.gnupg/gpg-agent.conf; then
243
         if ! grep -q 'allow-loopback-pinentry' /root/.gnupg/gpg-agent.conf; then
241
             echo 'allow-loopback-pinentry' >> /root/.gnupg/gpg-agent.conf
244
             echo 'allow-loopback-pinentry' >> /root/.gnupg/gpg-agent.conf
242
         fi
245
         fi
246
+        if [ -f /root/.gnupg/S.dirmngr ]; then
247
+            rm /root/.gnupg/S.dirmngr
248
+        fi
243
         echo RELOADAGENT | gpg-connect-agent
249
         echo RELOADAGENT | gpg-connect-agent
244
     else
250
     else
245
         if ! grep -q 'GPG_TTY' /home/$gpg_username/.bashrc; then
251
         if ! grep -q 'GPG_TTY' /home/$gpg_username/.bashrc; then
248
             echo 'export GPG_TTY' >> /home/$gpg_username/.bashrc
254
             echo 'export GPG_TTY' >> /home/$gpg_username/.bashrc
249
             chown $gpg_username:$gpg_username /home/$gpg_username/.bashrc
255
             chown $gpg_username:$gpg_username /home/$gpg_username/.bashrc
250
         fi
256
         fi
257
+        if grep -q '# use-agent' /home/$gpg_username/.gnupg/gpg.conf; then
258
+            sed -i 's|# use-agent|use-agent|g' /home/$gpg_username/.gnupg/gpg.conf
259
+        fi
251
         if ! grep -q 'use-agent' /home/$gpg_username/.gnupg/gpg.conf; then
260
         if ! grep -q 'use-agent' /home/$gpg_username/.gnupg/gpg.conf; then
252
             echo 'use-agent' >> /home/$gpg_username/.gnupg/gpg.conf
261
             echo 'use-agent' >> /home/$gpg_username/.gnupg/gpg.conf
253
         fi
262
         fi
260
         if ! grep -q 'allow-loopback-pinentry' /home/$gpg_username/.gnupg/gpg-agent.conf; then
269
         if ! grep -q 'allow-loopback-pinentry' /home/$gpg_username/.gnupg/gpg-agent.conf; then
261
             echo 'allow-loopback-pinentry' >> /home/$gpg_username/.gnupg/gpg-agent.conf
270
             echo 'allow-loopback-pinentry' >> /home/$gpg_username/.gnupg/gpg-agent.conf
262
         fi
271
         fi
272
+        if [ -f /home/$gpg_username/.gnupg/S.dirmngr ]; then
273
+            rm /home/$gpg_username/.gnupg/S.dirmngr
274
+        fi
263
         if [[ "$gpg_username" != "$USER" ]]; then
275
         if [[ "$gpg_username" != "$USER" ]]; then
264
             su -c "echo RELOADAGENT | gpg-connect-agent" - $gpg_username
276
             su -c "echo RELOADAGENT | gpg-connect-agent" - $gpg_username
265
         else
277
         else