From 6ff91789b2a93c1bd5b33c3fded78f24327dce1b Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2017 17:04:31 +0100 Subject: [PATCH] Rename 'config' option to 'symlink' because that's really all it's doing and we can use it for other things --- scripts/deploy.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/deploy.py b/scripts/deploy.py index e710e2c38d..d80f5329af 100755 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -67,7 +67,7 @@ class Deployer: self.bundles_path = None self.should_clean = False # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json' - self.config_locations = {} + self.symlink_paths = {} self.verify_signature = True def deploy(self, tarball, extract_path): @@ -99,11 +99,11 @@ class Deployer: print ("Extracted into: %s" % extracted_dir) - if self.config_locations: - for config_filename, config_loc in self.config_locations.iteritems(): + if self.symlink_paths: + for link_path, file_path in self.symlink_paths.iteritems(): create_relative_symlink( - target=config_loc, - linkname=os.path.join(extracted_dir, config_filename) + target=file_path, + linkname=os.path.join(extracted_dir, link_path) ) if self.bundles_path: @@ -166,9 +166,10 @@ if __name__ == "__main__": ) ) parser.add_argument( - "--config", nargs='*', default='./config*.json', help=( - "Write a symlink at config.json in the extracted tarball to this \ - location. (Default: '%(default)s')" + "--symlink", nargs='*', default='./config*.json', help=( + "Symlink these files into the root of the deployed tarball. \ + Useful for config files and home pages. Supports glob syntax. \ + (Default: '%(default)s')" ) ) parser.add_argument( @@ -184,9 +185,11 @@ if __name__ == "__main__": deployer.bundles_path = args.bundles_dir deployer.should_clean = args.clean - deployer.config_locations = {} + deployer.symlink_paths = {} - for c in args.config: - deployer.config_locations.update({ os.path.basename(c): pth for pth in glob.iglob(c) }) + for symlink in args.symlink: + deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(symlink) }) + + print("%r", (deployer.symlink_paths,)) deployer.deploy(args.tarball, args.extract_path)