Permalink
Browse files

Make unpacker work

  • Loading branch information...
1 parent bd7848c commit be1531dcdbf5b79c9cd24b8c1adbb58d0840e4d1 @nwgh nwgh committed May 1, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 installdmg.sh
  2. +3 −3 stoneridge_unpacker.py
View
@@ -30,7 +30,7 @@ while [ "$(echo mnt/*)" == "mnt/*" ]; do
i=$(expr $i + 1)
done
# Now we can copy everything out of the mnt directory into the current directory
-rsync -av ./mnt/* .
+rsync -av ./mnt/[a-zA-Z0-9]* .
hdiutil detach mnt
rm -rdf mnt
# Sleep for a bit to let messages from diskimage-helper go away
View
@@ -36,7 +36,7 @@ def run(self):
self.unpack_firefox()
# Unzip the stuff we need from the tests zipfile
- unzipdir = os.path.join(stoneridge.workdir, 'unzip')
+ unzipdir = os.path.join(stoneridge.workdir, 'tests')
os.mkdir(unzipdir)
subprocess.call(['unzip', self.testzip, 'bin*'], cwd=unzipdir)
@@ -48,15 +48,15 @@ def run(self):
components = os.path.join(unzipdir, 'bin', 'components', '*')
fxcomponents = os.path.join(stoneridge.bindir, 'components')
subprocess.call(['bash', '-c',
- 'cp -R "%s" "%s"' % (components, fxcomponents)])
+ 'cp -R %s %s' % (components, fxcomponents)])
# Put the plugins in place, in case we need them
fxplugins = os.path.join(stoneridge.bindir, 'plugins')
if not os.path.exists(fxplugins):
os.mkdir(fxplugins)
plugins = os.path.join(unzipdir, 'bin', 'plugins', '*')
subprocess.call(['bash', '-c',
- 'cp -R "%s" "%s"' % (plugins, fxplugins)])
+ 'cp -R %s %s' % (plugins, fxplugins)])
def unpack_firefox(self):
raise NotImplementedError

0 comments on commit be1531d

Please sign in to comment.