Skip to content

Commit

Permalink
AdobeReaderRepackager: avoid RECIPE_DIR to locate resources
Browse files Browse the repository at this point in the history
- if we use an override, RECIPE_DIR is our override dir rather
  than the parent recipe's dir, which is where our resources are
  actually located.
  • Loading branch information
timsutton committed Oct 9, 2013
1 parent 6359182 commit c1a29fc
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion AdobeReader/AdobeReaderRepackager.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,16 @@ def replace_app_preinstall(self, expanded_pkg):
if not os.path.exists(app_pkg):
raise ProcessorError("application.pkg not found!")
preinstall_script = os.path.join(app_pkg, "Scripts/preinstall")
our_script = os.path.join(self.env["RECIPE_DIR"],
our_script = os.path.join(os.path.dirname(__file__),
"package_resources/scripts/preinstall")
if not os.path.exists(our_script):
raise ProcessorError("%s not found" % our_script)
try:
shutil.copy(our_script, preinstall_script)
except (OSError, IOError), err:
raise ProcessorError("%s copying %s" % (err, preinstall_script))
self.output("Replaced pkg preinstall script with our custom script at %s" %
our_script)

def main(self):
# Mount the image.
Expand Down

0 comments on commit c1a29fc

Please sign in to comment.