From 054ea99ccd67e73919edb216480567796e57098b Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Fri, 05 Oct 2012 20:11:35 +0000
Subject: More workarounds with exec permissions

---
diff --git a/sugar_network/zerosugar/injector.py b/sugar_network/zerosugar/injector.py
index 75b2e98..f870d67 100644
--- a/sugar_network/zerosugar/injector.py
+++ b/sugar_network/zerosugar/injector.py
@@ -131,13 +131,14 @@ def _activity_env(selection, environ):
             (selection.local_path, environ['PYTHONPATH'])
     environ['SUGAR_LOCALEDIR'] = join(selection.local_path, 'locale')
 
-    bin_path = join(selection.local_path, 'bin')
-    if exists(bin_path):
-        environ['PATH'] = bin_path + ':' + environ['PATH']
-        # TODO Do it only once on unzip
-        # Activities might call bin/* files but python zipfile module
-        # doesn't set exec permissions while extracting
-        for filename in os.listdir(bin_path):
-            os.chmod(join(bin_path, filename), 0755)
+    # TODO Do it only once on unzip
+    # Activities might call bin/* files but python zipfile module
+    # doesn't set exec permissions while extracting
+    for exec_dir in ('bin', 'activity'):
+        bin_path = join(selection.local_path, exec_dir)
+        if exists(bin_path):
+            environ['PATH'] = bin_path + ':' + environ['PATH']
+            for filename in os.listdir(bin_path):
+                os.chmod(join(bin_path, filename), 0755)
 
     os.chdir(selection.local_path)
--
cgit v0.9.1