integratation of slapos.recipe.build:download-unpacked into software.cfg

software/b2evolution/software.cfg

@@ -14,14 +14,10 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://freefr.dl.sourceforge.net/project/evocms/b2evolution/b2evo%204.1.1-stable/b2evolution-4.1.1-stable-2011-10-03.zip
 md5sum = 63c771f43f0c40ff822fe80234be42e1
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/blogs", "${buildout:parts-directory}/${:_buildout_section_name_}")
+extract-directory = blogs
   
 [instance-recipe]
 egg = slapos.cookbook

software/eSKUeL/software.cfg

@@ -14,14 +14,9 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.phptools4u.com/generated_content/download/eskuel.zip
 md5sum = c91f6f238be715f303911dd00f281b78
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/ezpublish/software.cfg

@@ -14,14 +14,9 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://share.ez.no/content/download/118008/553423/version/3/file/ezpublish_community_project-2011.8-with_ezc.tar.bz2
 md5sum = 76ea4e1de7a3f91c8d24ef3a221e0777
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/joomla/software.cfg

@@ -14,14 +14,9 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz
 md5sum = 19451c0352e4c72d871cc8817126286a
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/lamp-template/software.cfg

@@ -14,14 +14,12 @@ extends =
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = recipe = slapos.recipe.build:download-unpacked
 url = Student shall put here url of zipped or tarballed web page or application
 md5sum = Student may put here md5sum of this file, this is good idea
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
+#If provided tarball does not contain top directory, option shall be changed to false
+#strip-top-level-dir = true | false
+#extract-directory = 
 
 [application-template]
 recipe = slapos.recipe.download

software/magento/software.cfg

@@ -13,14 +13,9 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.magentocommerce.com/downloads/assets/1.6.0.0/magento-1.6.0.0.tar.gz
 md5sum = 7415eb1c70b7694ab632326d9fcc850a
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [instance-recipe]
 egg = slapos.cookbook

software/net2ftp/software.cfg

@@ -15,14 +15,10 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.net2ftp.com/download/net2ftp_v0.98.zip
 md5sum = 5a2741b5881f3f229a788958dc6cdf10
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/files_to_upload", "${buildout:parts-directory}/${:_buildout_section_name_}")
+extract-directory = files_to_upload
 
 [configure-script]
 recipe = slapos.recipe.download
@@ -31,6 +27,7 @@ url = ${:_profile_base_location_}/configure.py
 md5sum = f7e1766468f7a8d51d311541164c3ff4
 filename = configure.py
 download-only = True
+mode = 0744
 
 [application-template]
 recipe = slapos.recipe.download

software/os-commerce/software.cfg

@@ -14,14 +14,10 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.oscommerce.com/files/oscommerce-3.0.2.zip
 md5sum = 680caf7dde7cf7772a576ef3930970ff
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/oscommerce", "${buildout:parts-directory}/${:_buildout_section_name_}")
+extract-directory = oscommerce
   
 [instance-recipe]
 egg = slapos.cookbook

software/zencart/software.cfg

@@ -15,7 +15,7 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://heanet.dl.sourceforge.net/project/zencart/CURRENT_%20Zen%20Cart%201.3.x%20Series/Zen%20Cart%20v1.3.9%20-%20Full%20Release/zen-cart-v1.3.9h-full-fileset-10262010.zip
 md5sum = e0a5fb39078321ced7f5a9c193f30927
 #If provided tarball does not contain top directory, option shall be changed to false
@@ -27,6 +27,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure.py
 filename = configure.py
 download-only = True
+mode = 0744
   
 [instance-recipe]
 egg = slapos.cookbook