Merge pull request #193124 from Homebrew/update-wezterm

wezterm: remove preflight block

Casks/w/wezterm.rb

@@ -18,7 +18,7 @@
 
   conflicts_with cask: "wezterm@nightly"
 
-  app "WezTerm.app"
+  app "WezTerm-macos-#{version.csv.first}-#{version.csv.second}/WezTerm.app"
   %w[
     wezterm
     wezterm-gui
@@ -28,21 +28,12 @@
     binary "#{appdir}/WezTerm.app/Contents/MacOS/#{tool}"
   end
 
-  binary "WezTerm.app/Contents/Resources/shell-completion/zsh",
+  binary "#{appdir}/WezTerm.app/Contents/Resources/shell-completion/zsh",
          target: "#{HOMEBREW_PREFIX}/share/zsh/site-functions/_wezterm"
-  binary "WezTerm.app/Contents/Resources/shell-completion/bash",
+  binary "#{appdir}/WezTerm.app/Contents/Resources/shell-completion/bash",
          target: "#{HOMEBREW_PREFIX}/etc/bash_completion.d/wezterm"
-  binary "WezTerm.app/Contents/Resources/shell-completion/fish",
+  binary "#{appdir}/WezTerm.app/Contents/Resources/shell-completion/fish",
          target: "#{HOMEBREW_PREFIX}/share/fish/vendor_completions.d/wezterm.fish"
 
-  preflight do
-    # Move "WezTerm-macos-#{version}/WezTerm.app" out of the subfolder
-    staged_subfolder = staged_path.glob(["WezTerm-*", "wezterm-*"]).first
-    if staged_subfolder
-      FileUtils.mv(staged_subfolder/"WezTerm.app", staged_path)
-      FileUtils.rm_r(staged_subfolder)
-    end
-  end
-
   zap trash: "~/Library/Saved Application State/com.github.wez.wezterm.savedState"
 end