nightly_repos.rake in packaging-0.109.0

- old
+ new

@@ -73,17 +73,18 @@
       target_prefix = args.target_prefix or fail ":target_prefix is a required argument for #{t}"
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
       mkdir("pkg")
 
       Dir.chdir("pkg") do
-        if versioning == 'ref'
+        case versioning
+        when 'ref'
           local_target = File.join(Pkg::Config.project, Pkg::Config.ref)
-        elsif versioning == 'version'
+        when 'version'
           local_target = File.join(Pkg::Config.project, Pkg::Util::Version.dot_version)
         end
 
-        FileUtils.mkdir_p([local_target, Pkg::Config.project + "-latest"])
+        FileUtils.mkdir_p([local_target, "#{Pkg::Config.project}-latest"])
 
         # Rake task dependencies with arguments are nuts, so we just directly
         # invoke them here.  We want the signed_* directories staged as
         # repos/repo_configs, because that's how we want them on the public
         # server
@@ -104,19 +105,19 @@
         # repo configs and link in the latest repos.  The repo_configs are
         # renamed to project-latest-$platform.{list,repo} to ensure that their
         # names stay the same between runs. Their contents have the ref
         # stripped off and the project replaced by $project-latest. Then the
         # repos directory is a symlink to the last pushed ref's repos.
-        FileUtils.cp_r(File.join(local_target, "repo_configs"), Pkg::Config.project + "-latest", { :preserve => true })
+        FileUtils.cp_r(File.join(local_target, "repo_configs"), "#{Pkg::Config.project}-latest", { :preserve => true })
 
         # Now we need to remove the ref and replace $project with
         # $project-latest so that it will work as a pinned latest repo
         # Also rename the repo config to a static filename.
         Dir.glob("#{Pkg::Config.project}-latest/repo_configs/**/*").select { |t_config| File.file?(t_config) }.each do |config|
           new_contents = File.read(config)
           new_contents.gsub!(%r{#{Pkg::Config.ref}/}, "")
-          new_contents.gsub!(%r{#{Pkg::Config.project}/}, Pkg::Config.project + "-latest/")
+          new_contents.gsub!(%r{#{Pkg::Config.project}/}, "#{Pkg::Config.project}-latest/")
           new_contents.gsub!(Pkg::Config.ref, "latest")
 
           File.open(config, "w") { |file| file.puts new_contents }
           FileUtils.mv(config, config.gsub(Pkg::Config.ref, "latest"))
         end
@@ -134,11 +135,11 @@
             FileUtils.mv(config, config.gsub(Pkg::Config.ref, Pkg::Util::Version.dot_version))
           end
         end
 
         # Make a latest symlink for the project
-        FileUtils.ln_sf(File.join("..", local_target, "repos"), File.join(Pkg::Config.project + "-latest"), :verbose => true)
+        FileUtils.ln_sf(File.join("..", local_target, "repos"), File.join("#{Pkg::Config.project}-latest"), :verbose => true)
       end
     end
 
     task :deploy_signed_repos, %i[target_host target_basedir foss_only] => "pl:fetch" do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument to #{t}"
@@ -229,13 +230,14 @@
       target_host = args.target_host or fail ":target_host is a required argument for #{t}"
       remote_dir = args.remote_dir or fail ":remote_dir is a required argument for #{t}"
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
       pe_version = args.pe_version or fail ":pe_version is a required argument for #{t}"
 
-      if versioning == 'ref'
+      case versioning
+      when 'ref'
         version_string = Pkg::Config.ref
-      elsif versioning == 'version'
-        version_string =  Pkg::Util::Version.dot_version
+      when 'version'
+        version_string = Pkg::Util::Version.dot_version
       end
 
       pa_source = File.join(remote_dir, Pkg::Config.project)
       pe_target = File.join(remote_dir, pe_version, Pkg::Config.project)
       local_pa = File.join(pa_source, version_string)