update release_dir

kickstarter · Sep 4, 2024 · 0a09911 · 0a09911
1 parent 82948c9
commit 0a09911
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lib/egads/command/extract.rb b/lib/egads/command/extract.rb
@@ -89,7 +89,12 @@ def do_extract(path)
 
  # Directory created upon successful extraction
  def release_dir
- RemoteConfig.release_dir(sha)
+ base_dir = RemoteConfig.release_dir(sha)
+ if options[:deployment_id]
+ deployment_id_value = deployment_id
+ return "#{base_dir}_#{deployment_id_value}" if deployment_id_value
+ end
+ base_dir
  end
 
  # Directory where in-progress extraction occurs

diff --git a/lib/egads/command/release.rb b/lib/egads/command/release.rb
@@ -57,9 +57,11 @@ def trim
 
  def dir
  base_dir = RemoteConfig.release_dir(sha)
- deployment_id_value = deployment_id if options[:deployment_id]
-
- deployment_id_value ? "#{base_dir}_#{deployment_id_value}" : base_dir
+ if options[:deployment_id]
+ deployment_id_value = deployment_id
+ return "#{base_dir}_#{deployment_id_value}" if deployment_id_value
+ end
+ base_dir
  end
 
  def release_to

diff --git a/lib/egads/command/stage.rb b/lib/egads/command/stage.rb
@@ -69,9 +69,11 @@ def mark_as_staged
 
  def dir
  base_dir = RemoteConfig.release_dir(sha)
- deployment_id_value = deployment_id if options[:deployment_id]
-
- deployment_id_value ? "#{base_dir}_#{deployment_id_value}" : base_dir
+ if options[:deployment_id]
+ deployment_id_value = deployment_id
+ return "#{base_dir}_#{deployment_id_value}" if deployment_id_value
+ end
+ base_dir
  end
 
  def stage_flag_path