[tor-commits] [ooni-probe/develop] Place data files into proper sub-directory structure

[isis at torproject.org]

commit 8ed046958dca07f8e7cf051ed3e6617b1ed3c6e1
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Jun 6 18:15:31 2013 +0200

    Place data files into proper sub-directory structure
---
 setup.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 6ebca7b..c0487b1 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 #-*- coding: utf-8 -*-
 
 import os
+from os.path import join as pj
 import sys
 from distutils.core import setup
 
@@ -16,13 +17,13 @@ dependency_links = [
     'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe'
 ]
 
-files = []
+data_files = []
 for root, dirs, file_names in os.walk('data/'):
+    files = []
     for file_name in file_names:
         if not file_name.endswith('.pyc'):
-            files.append(os.path.join(root, file_name))
-
-data_files = [('/usr/share/ooni/', files)]
+            files.append(pj(root, file_name))
+    data_files.append([pj('/usr/share/ooni', root), files])
 
 with open('requirements.txt') as f:
     for line in f: