gpg autodetermined in python script
This commit is contained in:
		@@ -1,10 +1,15 @@
 | 
				
			|||||||
import os.path
 | 
					import os.path
 | 
				
			||||||
import subprocess
 | 
					import subprocess
 | 
				
			||||||
 | 
					import distutils.spawn
 | 
				
			||||||
home = os.path.expanduser("~")
 | 
					home = os.path.expanduser("~")
 | 
				
			||||||
def mailpasswd(acct):
 | 
					def mailpasswd(acct):
 | 
				
			||||||
  acct = os.path.basename(acct)
 | 
					  acct = os.path.basename(acct)
 | 
				
			||||||
  path = "%s/.local/share/muttwizard/%s.gpg" % (home,acct)
 | 
					  path = "%s/.local/share/muttwizard/%s.gpg" % (home,acct)
 | 
				
			||||||
  args = ["gpg2", "--use-agent", "--quiet", "--batch", "-d", path]
 | 
					  if distutils.spawn.find_executable("gpg"):
 | 
				
			||||||
 | 
					      GPG="gpg"
 | 
				
			||||||
 | 
					  else:
 | 
				
			||||||
 | 
					      GPG="gpg2"
 | 
				
			||||||
 | 
					  args = [GPG, "--use-agent", "--quiet", "--batch", "-d", path]
 | 
				
			||||||
  try:
 | 
					  try:
 | 
				
			||||||
    return subprocess.check_output(args).strip().decode('UTF-8')
 | 
					    return subprocess.check_output(args).strip().decode('UTF-8')
 | 
				
			||||||
  except subprocess.CalledProcessError:
 | 
					  except subprocess.CalledProcessError:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user