feat: merge zip asset branch into main, Optiscaler 7 version now main standard

1 files changed, 5 insertions, 36 deletions

diff --git a/defaults/assets/prepare.sh b/defaults/assets/prepare.sh
index 888c4f3..755f8de 100755
--- a/defaults/assets/prepare.sh
+++ b/defaults/assets/prepare.sh
@@ -7,9 +7,6 @@ mod_path="$HOME/fgmod"
 bin_path="$(dirname "$(realpath "$0")")/../bin"
 assets_path="$(dirname "$(realpath "$0")")"
 
-nvidiaver="NVIDIA-Linux-x86_64-555.52.04.run"
-enablerver="dlss-enabler-setup-3.02.000.0.exe"
-fakenvapiver="fakenvapi.7z"
 standalone=1
 
 if [[ -d "$mod_path" ]] && [[ ! $mod_path == . ]]; then
@@ -19,44 +16,16 @@ fi
 mkdir -p "$mod_path"
 cd "$mod_path" || exit 1
 
-# Copy required files from bin directory
-cp "$bin_path/$enablerver" .
-cp "$bin_path/$nvidiaver" .
-cp "$bin_path/d3dcompiler_47.dll" .
-cp "$bin_path/innoextract" .
-cp "$bin_path/$fakenvapiver" .
+# Copy required files from bin directory into the current directory
+cp "$bin_path/assets.zip" .
+
+# Unzip assets.zip so that all files are in the modpath root, then remove the zip file
+unzip -j -o assets.zip && rm assets.zip
 
 # Copy fgmod.sh and fgmod-uninstaller.sh from defaults/assets
 cp "$assets_path/fgmod.sh" "$mod_path/fgmod" || exit 1
 cp "$assets_path/fgmod-uninstaller.sh" "$mod_path" || exit 1
 
-if [[ ! -f "$enablerver" || ! -f "$nvidiaver" || ! -f "d3dcompiler_47.dll" || ! -f "innoextract" || ! -f "$fakenvapiver" || ! -f "fgmod" || ! -f "fgmod-uninstaller.sh" ]]; then
-    echo "Missing one or more required files. Exiting."
-    exit 1
-fi
-
-# Extract files
-chmod +x "$nvidiaver"
-./"$nvidiaver" -x
-
-chmod +x innoextract
-./innoextract "$enablerver"
-
-# Prepare mod files
-mv app/* .
-rm -r app
-[[ -f "$(which 7z 2>/dev/null)" ]] && 7z -y x "$fakenvapiver"
-cp -f NVIDIA-Linux-x86_64-555.52.04/nvngx.dll _nvngx.dll
-cp -f NVIDIA-Linux-x86_64-555.52.04/LICENSE "licenses/LICENSE (NVIDIA driver)"
-chmod +r _nvngx.dll
-
-# Cleanup
-rm -rf innoextract NVIDIA-Linux-x86_64-555.52.04 dlss-enabler-setup-3.02.000.0.exe NVIDIA-Linux-x86_64-555.52.04.run fakenvapi.7z
-rm -rf plugins nvapi64-proxy.dll dlss-enabler-fsr.dll dlss-enabler-xess.dll dbghelp.dll version.dll winmm.dll nvngx.dll \
-       dlss-finder.exe dlss-enabler.log dlssg_to_fsr3.log fakenvapi.log "LICENSE (DLSSG to FSR3 mod).txt" \
-       "Readme (DLSS enabler).txt" "READ ME (DLSSG to FSR3 mod).txt" "XESS LICENSE.pdf"
-[[ -f "$(which nvidia-smi 2>/dev/null)" ]] && rm -rf nvapi64.dll fakenvapi.ini
-
 # Update paths in scripts
 sed -i 's|mod_path="/usr/share/fgmod"|mod_path="'"$mod_path"'"|g' fgmod
 chmod +x fgmod