Merge branch 'develop' into expired_key

diff --cc setup.py
index 6bb44b69325e904d3c10b1397128ad8f80d662c9,a79d3b39898806c3b76c2a6f5757469fc3f4b58a..1649eb4690fe581a44bb0641cc1fb4b09cbbd7d3
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -69,40 -71,34 +69,39 @@@ with open(os.path.join(SHARE, "torbrows
  
  datafiles = []
  for root, dirs, files in os.walk(SHARE):
-     datafiles.append(
-         (os.path.join(sys.prefix, root), [os.path.join(root, f) for f in files])
-     )
+     if files:
+         datafiles.append((root, [os.path.join(root, f) for f in files]))
  
  # disable shipping apparmor profiles until they work in ubuntu (#128)
 -if distro != 'Ubuntu':
 -    if not hasattr(sys, 'real_prefix'):
 +if distro != "Ubuntu":
 +    if not hasattr(sys, "real_prefix"):
          # we're not in a virtualenv, so we can probably write to /etc
          datafiles += [
 -            ('/etc/apparmor.d/', [
 -                'apparmor/torbrowser.Browser.firefox',
 -                'apparmor/torbrowser.Tor.tor']),
 -            ('/etc/apparmor.d/local/', [
 -                'apparmor/local/torbrowser.Browser.firefox',
 -                'apparmor/local/torbrowser.Tor.tor']),
 -            ('/etc/apparmor.d/tunables/', ['apparmor/tunables/torbrowser'])
 +            (
 +                "/etc/apparmor.d/",
 +                ["apparmor/torbrowser.Browser.firefox", "apparmor/torbrowser.Tor.tor"],
 +            ),
 +            (
 +                "/etc/apparmor.d/local/",
 +                [
 +                    "apparmor/local/torbrowser.Browser.firefox",
 +                    "apparmor/local/torbrowser.Tor.tor",
 +                ],
 +            ),
 +            ("/etc/apparmor.d/tunables/", ["apparmor/tunables/torbrowser"]),
          ]
  
- datafiles += [("/usr/share/locale/", create_mo_files())]
+ datafiles += [(os.path.dirname(f), [f]) for f in create_mo_files()]
  
  setup(
 -    name='torbrowser-launcher',
 +    name="torbrowser-launcher",
      version=version,
 -    author='Micah Lee',
 -    author_email='micah@micahflee.com',
 -    url='https://www.github.com/micahflee/torbrowser-launcher',
 -    platforms=['GNU/Linux'],
 -    license='MIT',
 -    description='A program to help you securely download and run Tor Browser',
 +    author="Micah Lee",
 +    author_email="micah@micahflee.com",
 +    url="https://www.github.com/micahflee/torbrowser-launcher",
 +    platforms=["GNU/Linux"],
 +    license="MIT",
 +    description="A program to help you securely download and run Tor Browser",
      long_description="""
  Tor Browser Launcher is intended to make Tor Browser easier to install and use
  for GNU/Linux users. You install torbrowser-launcher from your distribution's

diff --cc torbrowser_launcher/common.py
index 2cad29ff84f59589dd782f0d201771d3c5fd23b6,3a3a430a1beb81af6351eaff1543e99f767ccf4b..e7af753a4218ad7abc1fafe017badb8b4a5694da
--- 1/torbrowser_launcher/common.py
--- 2/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@@ -113,27 -86,33 +113,35 @@@ class Common(object)
                              self.language = l
              # if language isn't available, default to english
              if self.language not in available_languages:
 -                self.language = 'en-US'
 +                self.language = "en-US"
  
+     # get value of environment variable, if it is not set return the default value
+     @staticmethod
+     def get_env(var_name, default_value):
+         value = os.getenv(var_name)
+         if not value:
+             value = default_value
+         return value
+ 
      # build all relevant paths
      def build_paths(self, tbb_version=None):
 -        homedir = os.getenv('HOME')
 +        homedir = os.getenv("HOME")
          if not homedir:
 -            homedir = '/tmp/.torbrowser-'+os.getenv('USER')
 +            homedir = "/tmp/.torbrowser-" + os.getenv("USER")
              if not os.path.exists(homedir):
                  try:
                      os.mkdir(homedir, 0o700)
                  except:
 -                    self.set_gui('error', _("Error creating {0}").format(homedir), [], False)
 +                    self.set_gui(
 +                        "error", _("Error creating {0}").format(homedir), [], False
 +                    )
          if not os.access(homedir, os.W_OK):
 -            self.set_gui('error', _("{0} is not writable").format(homedir), [], False)
 +            self.set_gui("error", _("{0} is not writable").format(homedir), [], False)
  
-         tbb_config = "{0}/.config/torbrowser".format(homedir)
-         tbb_cache = "{0}/.cache/torbrowser".format(homedir)
-         tbb_local = "{0}/.local/share/torbrowser".format(homedir)
-         old_tbb_data = "{0}/.torbrowser".format(homedir)
+         tbb_config = '{0}/torbrowser'.format(self.get_env('XDG_CONFIG_HOME', '{0}/.config'.format(homedir)))
+         tbb_cache = '{0}/torbrowser'.format(self.get_env('XDG_CACHE_HOME', '{0}/.cache'.format(homedir)))
+         tbb_local = '{0}/torbrowser'.format(self.get_env('XDG_DATA_HOME', '{0}/.local/share'.format(homedir)))
+         old_tbb_data = '{0}/.torbrowser'.format(homedir)
  
          if tbb_version:
              # tarball filename