diff options
| author | Tulio Casagrande <tuliocasagrande@gmail.com> | 2017-01-04 20:00:16 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-04 20:00:16 -0200 |
| commit | 7a36297b7942e5f536bb39cd428c7b1dfa36221b (patch) | |
| tree | e79f73fa9a9a5f180dc0a6739ff8c0def302492a /service | |
| parent | ebdeec4ad6d0f91bc60fd34a580fc02787026692 (diff) | |
| parent | 3ef49142a553ed53aa3fe3c60539b93542434044 (diff) | |
Merge pull request #898 from bwagnerr/simplify_static
Simplifies the get_static_folder on RootResource
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/resources/root_resource.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index 101ff6b8..b4eef4ec 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -111,11 +111,7 @@ class RootResource(BaseResource): return os.path.join(path, '..', 'assets') def _get_static_folder(self): - static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "dist")) - # this is a workaround for packaging - if not os.path.exists(static_folder): - static_folder = os.path.abspath( - os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist")) + static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist")) if not os.path.exists(static_folder): static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent') return static_folder |