From b6f74b3f0f909ac7ec622bd7cd4467ba93255c67 Mon Sep 17 00:00:00 2001
From: xXJSONDeruloXx <danielhimebauch@gmail.com>
Date: Thu, 25 Sep 2025 15:32:36 -0400
Subject: feat: rm nvapi64 dll for legacy fakenvapi cleanup

---
 defaults/assets/fgmod-uninstaller.sh | 4 ++--
 defaults/assets/fgmod.sh             | 6 +++++-
 justfile                             | 3 ++-
 package.json                         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/defaults/assets/fgmod-uninstaller.sh b/defaults/assets/fgmod-uninstaller.sh
index a2c626a..779b87b 100755
--- a/defaults/assets/fgmod-uninstaller.sh
+++ b/defaults/assets/fgmod-uninstaller.sh
@@ -124,7 +124,7 @@ rm -f "dlssg_to_fsr3_amd_is_better.dll" "dlssg_to_fsr3.ini"
 # === Remove NVAPI Files (Current and Legacy) ===
 echo "🧹 Removing NVAPI files..."
 rm -f "fakenvapi.dll" "fakenvapi.ini"  # Current v0.9.0-pre4 approach
-rm -f "nvapi64.dll"                    # Legacy cleanup for older versions
+rm -f "nvapi64.dll" "nvapi64.dll.b"    # Legacy cleanup for older versions and backups
 
 # === Remove ASI Plugins ===
 echo "🧹 Removing ASI plugins directory..."
@@ -138,7 +138,7 @@ rm -f "dlssg_to_fsr3_amd_is_better-3.0.dll"
 
 # === Restore Original DLLs ===
 echo "🔄 Restoring original DLLs..."
-original_dlls=("d3dcompiler_47.dll" "amd_fidelityfx_dx12.dll" "amd_fidelityfx_framegeneration_dx12.dll" "amd_fidelityfx_upscaler_dx12.dll" "amd_fidelityfx_vk.dll" "nvapi64.dll" "libxess.dll" "libxess_dx11.dll" "libxess_fg.dll" "libxell.dll")
+original_dlls=("d3dcompiler_47.dll" "amd_fidelityfx_dx12.dll" "amd_fidelityfx_framegeneration_dx12.dll" "amd_fidelityfx_upscaler_dx12.dll" "amd_fidelityfx_vk.dll" "libxess.dll" "libxess_dx11.dll" "libxess_fg.dll" "libxell.dll")
 for dll in "${original_dlls[@]}"; do
   if [[ -f "${dll}.b" ]]; then
     mv "${dll}.b" "$dll"
diff --git a/defaults/assets/fgmod.sh b/defaults/assets/fgmod.sh
index 7a5aebe..a4a7f6f 100755
--- a/defaults/assets/fgmod.sh
+++ b/defaults/assets/fgmod.sh
@@ -99,11 +99,15 @@ logger -t fgmod "📄 Preserve INI: $preserve_ini"
 rm -f "$exe_folder_path"/{dxgi.dll,winmm.dll,nvngx.dll,_nvngx.dll,nvngx-wrapper.dll,dlss-enabler.dll,OptiScaler.dll}
 
 # === Optional: Backup Original DLLs ===
-original_dlls=("d3dcompiler_47.dll" "amd_fidelityfx_dx12.dll" "amd_fidelityfx_framegeneration_dx12.dll" "amd_fidelityfx_upscaler_dx12.dll" "amd_fidelityfx_vk.dll" "nvapi64.dll")
+original_dlls=("d3dcompiler_47.dll" "amd_fidelityfx_dx12.dll" "amd_fidelityfx_framegeneration_dx12.dll" "amd_fidelityfx_upscaler_dx12.dll" "amd_fidelityfx_vk.dll")
 for dll in "${original_dlls[@]}"; do
   [[ -f "$exe_folder_path/$dll" && ! -f "$exe_folder_path/$dll.b" ]] && mv -f "$exe_folder_path/$dll" "$exe_folder_path/$dll.b"
 done
 
+# === Remove nvapi64.dll and its backup (conflicts from previous fakenvapi versions) ===
+rm -f "$exe_folder_path/nvapi64.dll" "$exe_folder_path/nvapi64.dll.b"
+echo "🧹 Cleaned up nvapi64.dll and backup (legacy fakenvapi conflicts)"
+
 # === Core Install ===
 if [[ -f "$fgmod_path/renames/$dll_name" ]]; then
   echo "✅ Using pre-renamed $dll_name"
diff --git a/justfile b/justfile
index d0a07ba..4407567 100644
--- a/justfile
+++ b/justfile
@@ -8,4 +8,5 @@ test:
     scp "out/Decky Framegen.zip" deck@192.168.0.6:~/Desktop
 
 clean:
-    rm -rf node_modules dist
\ No newline at end of file
+    rm -rf node_modules dist
+    sudo rm -rf /tmp/decky
\ No newline at end of file
diff --git a/package.json b/package.json
index 7011318..b6b8bb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decky-framegen",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "This plugin installs and manages OptiScaler, a tool that enhances upscaling and enables frame generation in a range of DirectX 12 games.",
   "type": "module",
   "scripts": {
-- 
cgit v1.2.3