From 8cf82b3c08567fff6d3fb440cbbf61ac5cc9f9aa Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 21 Jan 2025 20:22:12 -0700
Subject: [PATCH] misc: replace NEW_WINEPREFIX with LAST_WINEPREFIX

The winetricks_set_wineprefix function needs to run at least once even
if WINEPREFIX was already set in the environment before running
winetricks.

This partially reverts commit 21f2f7335db0c7de43a3b8cc9cc3ee416cd0cf1f.

Fixes #2325
---
 src/winetricks | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/winetricks b/src/winetricks
index 1224601e3..95f267afc 100755
--- a/src/winetricks
+++ b/src/winetricks
@@ -4361,17 +4361,17 @@ winetricks_set_wineprefix()
     # Note: these are arch independent, but are needed by some arch dependent variables
     # Defining here to avoid having two arch checks:
     if ! test "$1"; then
-        NEW_WINEPREFIX="${WINETRICKS_ORIGINAL_WINEPREFIX}"
+        WINEPREFIX="${WINETRICKS_ORIGINAL_WINEPREFIX}"
     else
-        NEW_WINEPREFIX="${W_PREFIXES_ROOT}/$1"
+        WINEPREFIX="${W_PREFIXES_ROOT}/$1"
     fi
 
-    if test "${WINEPREFIX}" = "${NEW_WINEPREFIX}"; then
+    if test "${WINEPREFIX}" = "${LAST_WINEPREFIX}"; then
         # A previous verb already set the prefix
         return
     fi
 
-    WINEPREFIX="${NEW_WINEPREFIX}"
+    LAST_WINEPREFIX="${WINEPREFIX}"
     export WINEPREFIX
     w_try_mkdir "$(dirname "${WINEPREFIX}")"